airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ramin...@apache.org
Subject [1/2] airavata git commit: To fix output and stdout/error paths in job context.AIRAVATA-1551
Date Fri, 16 Jan 2015 19:59:49 GMT
Repository: airavata
Updated Branches:
  refs/heads/master 47ea03368 -> 12bf4c5d8


To fix output and stdout/error paths in job context.AIRAVATA-1551

Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ab59a157
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ab59a157
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ab59a157

Branch: refs/heads/master
Commit: ab59a1574f7e760345443fe600a0137fe833c093
Parents: 47ea033
Author: raminder <ramifnu@indiana.edu>
Authored: Fri Jan 16 14:56:18 2015 -0500
Committer: raminder <ramifnu@indiana.edu>
Committed: Fri Jan 16 14:56:18 2015 -0500

----------------------------------------------------------------------
 .../java/org/apache/airavata/gfac/ssh/util/HandleOutputs.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/ab59a157/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/HandleOutputs.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/HandleOutputs.java
b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/HandleOutputs.java
index a5ea986..e64b0be 100644
--- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/HandleOutputs.java
+++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/HandleOutputs.java
@@ -44,7 +44,7 @@ public class HandleOutputs {
 							outputFile = output.getLocation()+ fileName;
 						}
 						cluster.scpFrom(outputFile, outputDataDir);
-						String localFile = outputDataDir + File.separator + output.getValue();
+						String localFile = outputDataDir + File.separator + fileName;
 						jobExecutionContext.addOutputFile(localFile);
 						output.setValue(localFile);
 						outputArray.add(output);
@@ -56,6 +56,7 @@ public class HandleOutputs {
 					cluster.scpFrom(downloadFile, outputDataDir);
 					String localFile = outputDataDir + File.separator + fileName;
 					jobExecutionContext.addOutputFile(localFile);
+					jobExecutionContext.setStandardOutput(localFile);
 					output.setValue(localFile);
 					outputArray.add(output);
 
@@ -65,6 +66,7 @@ public class HandleOutputs {
 					cluster.scpFrom(downloadFile, outputDataDir);
 					String localFile = outputDataDir + File.separator + fileName;
 					jobExecutionContext.addOutputFile(localFile);
+					jobExecutionContext.setStandardError(localFile);
 					output.setValue(localFile);
 					outputArray.add(output);
 
@@ -86,6 +88,7 @@ public class HandleOutputs {
 		} catch (Exception e) {
 			throw new GFacHandlerException(e);
 		}
+		jobExecutionContext.getTaskData().setApplicationOutputs(outputArray);
 		return outputArray;
 	}
 }


Mime
View raw message