You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2014/11/20 17:52:05 UTC
airavata git commit: br2 amber output data handling
Repository: airavata
Updated Branches:
refs/heads/master e2e9d2c47 -> ab23ac920
br2 amber output data handling
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ab23ac92
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ab23ac92
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ab23ac92
Branch: refs/heads/master
Commit: ab23ac9203a2e103a27e3dce23a64330015fc202
Parents: e2e9d2c
Author: Chathuri Wimalasena <ka...@gmail.com>
Authored: Thu Nov 20 11:51:49 2014 -0500
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Thu Nov 20 11:51:49 2014 -0500
----------------------------------------------------------------------
.../server/src/main/resources/gfac-config.xml | 18 ++++++++++++++++++
.../gfac/ssh/handler/SSHOutputHandler.java | 4 ++--
.../gsi/ssh/impl/GSISSHAbstractCluster.java | 4 ++--
3 files changed, 22 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/ab23ac92/modules/configuration/server/src/main/resources/gfac-config.xml
----------------------------------------------------------------------
diff --git a/modules/configuration/server/src/main/resources/gfac-config.xml b/modules/configuration/server/src/main/resources/gfac-config.xml
index fefe23e..c80f90b 100644
--- a/modules/configuration/server/src/main/resources/gfac-config.xml
+++ b/modules/configuration/server/src/main/resources/gfac-config.xml
@@ -68,10 +68,28 @@
<Provider class="org.apache.airavata.gfac.ssh.provider.impl.SSHProvider" submission="SSH" executionMode="async">
<InHandlers>
<Handler class="org.apache.airavata.gfac.ssh.handler.SSHDirectorySetupHandler"/>
+ <!--Handler class="org.apache.airavata.gfac.ssh.handler.AdvancedSCPInputHandler">
+ <property name="privateKeyPath" value="/Users/lahirugunathilake/.ssh/id_dsa"/>
+ <property name="publicKeyPath" value="/Users/lahirugunathilake/.ssh/id_dsa.pub"/>
+ <property name="userName" value="root"/>
+ <property name="hostName" value="gw98.iu.xsede.org"/>
+ <property name="inputPath" value="/tmp"/>
+ <property name="passPhrase" value="/home/airavata/outputData"/>
+ <property name="password" value="/home/airavata/outputData"/> <either we have to set password or keys, password has higher preference>
+ </Handler-->
<Handler class="org.apache.airavata.gfac.ssh.handler.SSHInputHandler"/>
</InHandlers>
<OutHandlers>
<Handler class="org.apache.airavata.gfac.ssh.handler.SSHOutputHandler"/>
+ <!--Handler class="org.apache.airavata.gfac.ssh.handler.AdvancedSCPOutputHandler">
+ <property name="privateKeyPath" value="/Users/lahirugunathilake/.ssh/id_dsa"/>
+ <property name="publicKeyPath" value="/Users/lahirugunathilake/.ssh/id_dsa.pub"/>
+ <property name="userName" value="root"/>
+ <property name="hostName" value="gw111.iu.xsede.org"/>
+ <property name="outputPath" value="/tmp"/>
+ <property name="passPhrase" value="/home/airavata/outputData"/>
+ <property name="password" value="/home/airavata/outputData"/> <either we have to set password or keys, password has higher preference>
+ </Handler-->
</OutHandlers>
</Provider>
<Provider class="org.apache.airavata.gfac.gsissh.provider.impl.GSISSHProvider" submission="SSH" security="GSI" executionMode="async">
http://git-wip-us.apache.org/repos/asf/airavata/blob/ab23ac92/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java
index 0b8201a..e2469fd 100644
--- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java
+++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java
@@ -148,7 +148,7 @@ public class SSHOutputHandler extends AbstractHandler {
Thread.sleep(2000);
}
- if (outputList.size() == 0 || outputList.get(0).isEmpty() || outputList.size() > 0) {
+ if (outputList.size() == 0 || outputList.get(0).isEmpty() || outputList.size() > 1) {
OutputUtils.fillOutputFromStdout(output, stdOutStr, stdErrStr, outputArray);
Set<String> strings = output.keySet();
outputArray.clear();
@@ -170,7 +170,7 @@ public class SSHOutputHandler extends AbstractHandler {
}
break;
- } else if (outputList.size() == 0) {//FIXME: Ultrascan case
+ } else if (outputList.size() == 1) {//FIXME: Ultrascan case
String valueList = outputList.get(0);
cluster.scpFrom(jobExecutionContext.getOutputDir() + File.separator + valueList, outputDataDir);
String outputPath = outputDataDir + File.separator + valueList;
http://git-wip-us.apache.org/repos/asf/airavata/blob/ab23ac92/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/GSISSHAbstractCluster.java
----------------------------------------------------------------------
diff --git a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/GSISSHAbstractCluster.java b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/GSISSHAbstractCluster.java
index 56bad83..a8faf53 100644
--- a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/GSISSHAbstractCluster.java
+++ b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/GSISSHAbstractCluster.java
@@ -390,7 +390,7 @@ public class GSISSHAbstractCluster implements Cluster {
reconnect(serverInfo, authenticationInfo);
if (retry == 0) {
throw new SSHApiException("Failed during scping local file:" + localFile + " to remote file "
- + serverInfo.getHost() + ":rFile", e);
+ + serverInfo.getHost() + ":rFile : " + remoteFile, e);
}
} catch (JSchException e) {
retry--;
@@ -402,7 +402,7 @@ public class GSISSHAbstractCluster implements Cluster {
reconnect(serverInfo, authenticationInfo);
if (retry == 0) {
throw new SSHApiException("Failed during scping local file:" + localFile + " to remote file "
- + serverInfo.getHost() + ":rFile", e);
+ + serverInfo.getHost() + ":rFile : " + remoteFile, e);
}
}
}