Repository: airavata Updated Branches: refs/heads/master a0960564c -> a6451c934
fixing scp output Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a6451c93 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a6451c93 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a6451c93 Branch: refs/heads/master Commit: a6451c9345d4e64cf6242c23a68e27c8a49daa8f Parents: a096056 Author: lahiru <[email protected]> Authored: Thu Mar 13 10:08:09 2014 -0400 Committer: lahiru <[email protected]> Committed: Thu Mar 13 10:08:09 2014 -0400 ---------------------------------------------------------------------- .../airavata/gfac/handler/AdvancedSCPOutputHandler.java | 9 +++++---- .../org/apache/airavata/gfac/handler/SCPOutputHandler.java | 9 ++++++--- 2 files changed, 11 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/a6451c93/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/AdvancedSCPOutputHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/AdvancedSCPOutputHandler.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/AdvancedSCPOutputHandler.java index fd5d0fa..65b430e 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/AdvancedSCPOutputHandler.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/AdvancedSCPOutputHandler.java @@ -35,6 +35,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.File; +import java.util.List; import java.util.Map; /** @@ -94,10 +95,10 @@ public class AdvancedSCPOutputHandler extends AbstractHandler { ServerInfo serverInfo = new ServerInfo(this.userName, this.hostName); try { Cluster pbsCluster = new PBSCluster(serverInfo, authenticationInfo, CommonUtils.getPBSJobManager("/opt/torque/torque-4.2.3.1/bin/")); - String parentPath = outputPath + File.separator + jobExecutionContext.getExperimentID() + File.separator + jobExecutionContext.getTaskData().getTaskID(); - pbsCluster.makeDirectory(parentPath); - pbsCluster.scpTo(parentPath, standardError); - pbsCluster.scpTo(parentPath, standardOutput); + List<String> strings = pbsCluster.listDirectory(outputDataDirectory); + for(String files:strings){ + pbsCluster.scpTo(outputDataDirectory,files); + } } catch (SSHApiException e) { log.error("Error transfering files to remote host : " + hostName + " with the user: " + userName); log.error(e.getMessage()); http://git-wip-us.apache.org/repos/asf/airavata/blob/a6451c93/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/SCPOutputHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/SCPOutputHandler.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/SCPOutputHandler.java index 5444dd9..ee6369e 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/SCPOutputHandler.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/SCPOutputHandler.java @@ -86,13 +86,16 @@ public class SCPOutputHandler extends AbstractHandler{ outputDataDir = taskData.getAdvancedOutputDataHandling().getOutputDataDir(); } if(outputDataDir == null) { - outputDataDir = File.separator + "tmp" + jobExecutionContext.getExperimentID() + "-" +jobExecutionContext.getTaskData().getTaskID(); + outputDataDir = File.separator + "tmp"; } + outputDataDir = outputDataDir + jobExecutionContext.getExperimentID() + "-" +jobExecutionContext.getTaskData().getTaskID(); + (new File(outputDataDir)).mkdirs(); app.setOutputDataDirectory(outputDataDir); // These will be useful if we are doing third party transfer + + localStdOutFile = new File(outputDataDir + File.separator + timeStampedServiceName + "stdout"); localStdErrFile = new File(outputDataDir + File.separator + timeStampedServiceName + "stderr"); - cluster.makeDirectory(outputDataDir); - +// cluster.makeDirectory(outputDataDir); cluster.scpFrom(app.getStandardOutput(), localStdOutFile.getAbsolutePath()); cluster.scpFrom(app.getStandardError(), localStdErrFile.getAbsolutePath());
