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 2015/01/16 16:51:40 UTC
airavata git commit: making clone experiment work
Repository: airavata
Updated Branches:
refs/heads/master 3c4877164 -> 47ea03368
making clone experiment work
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/47ea0336
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/47ea0336
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/47ea0336
Branch: refs/heads/master
Commit: 47ea033684c4bf53ce9c23f7cfd58d8a1c2f2cc7
Parents: 3c48771
Author: Chathuri Wimalasena <ka...@gmail.com>
Authored: Fri Jan 16 10:51:33 2015 -0500
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Fri Jan 16 10:51:33 2015 -0500
----------------------------------------------------------------------
.../airavata/gfac/core/cpi/BetterGfacImpl.java | 5 ++++-
.../gfac/ssh/handler/AdvancedSCPOutputHandler.java | 16 ++++++++++++----
2 files changed, 16 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/47ea0336/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
index dc7a28d..a712a74 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
@@ -382,7 +382,10 @@ public class BetterGfacImpl implements GFac,Watcher {
for (OutputDataObjectType objectType : taskOutputs){
if (objectType.getType() == DataType.URI && objectType.getValue() != null){
- objectType.setValue(jobExecutionContext.getOutputDir() + File.separator + objectType.getValue());
+ // this should be also the relatvie path : in case of clone, this will contain full path
+ String filePath = objectType.getValue();
+ filePath = filePath.substring(filePath.lastIndexOf(File.separatorChar) + 1, filePath.length());
+ objectType.setValue(jobExecutionContext.getOutputDir() + File.separator + filePath);
}
if (objectType.getType() == DataType.STDOUT){
objectType.setValue(jobExecutionContext.getOutputDir() + File.separator + jobExecutionContext.getApplicationName() + ".stdout");
http://git-wip-us.apache.org/repos/asf/airavata/blob/47ea0336/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java
index 472b0d7..e81979d 100644
--- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java
+++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java
@@ -155,6 +155,10 @@ public class AdvancedSCPOutputHandler extends AbstractHandler {
dataObjectType.setValue(outputPath + File.separatorChar + fileName);
dataObjectType.setName(paramName);
dataObjectType.setType(DataType.URI);
+ dataObjectType.setIsRequired(outputDataObjectType.isIsRequired());
+ dataObjectType.setRequiredToAddedToCommandLine(outputDataObjectType.isRequiredToAddedToCommandLine());
+ dataObjectType.setApplicationArgument(outputDataObjectType.getApplicationArgument());
+ dataObjectType.setSearchQuery(outputDataObjectType.getSearchQuery());
outputArray.add(dataObjectType);
}else if (outputDataObjectType.getType() == DataType.STDOUT) {
pbsCluster.scpTo(outputPath, standardOutput);
@@ -163,8 +167,10 @@ public class AdvancedSCPOutputHandler extends AbstractHandler {
dataObjectType.setValue(outputPath + File.separatorChar + fileName);
dataObjectType.setName(paramName);
dataObjectType.setType(DataType.STDOUT);
- dataObjectType.setIsRequired(true);
- dataObjectType.setRequiredToAddedToCommandLine(true);
+ dataObjectType.setIsRequired(outputDataObjectType.isIsRequired());
+ dataObjectType.setRequiredToAddedToCommandLine(outputDataObjectType.isRequiredToAddedToCommandLine());
+ dataObjectType.setApplicationArgument(outputDataObjectType.getApplicationArgument());
+ dataObjectType.setSearchQuery(outputDataObjectType.getSearchQuery());
outputArray.add(dataObjectType);
}else if (outputDataObjectType.getType() == DataType.STDERR) {
pbsCluster.scpTo(outputPath, standardError);
@@ -173,8 +179,10 @@ public class AdvancedSCPOutputHandler extends AbstractHandler {
dataObjectType.setValue(outputPath + File.separatorChar + fileName);
dataObjectType.setName(paramName);
dataObjectType.setType(DataType.STDERR);
- dataObjectType.setIsRequired(true);
- dataObjectType.setRequiredToAddedToCommandLine(true);
+ dataObjectType.setIsRequired(outputDataObjectType.isIsRequired());
+ dataObjectType.setRequiredToAddedToCommandLine(outputDataObjectType.isRequiredToAddedToCommandLine());
+ dataObjectType.setApplicationArgument(outputDataObjectType.getApplicationArgument());
+ dataObjectType.setSearchQuery(outputDataObjectType.getSearchQuery());
outputArray.add(dataObjectType);
}
}