You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ms...@apache.org on 2015/06/30 17:59:44 UTC
airavata git commit: now expected stdout and stderr values are being
passed to the provider, please review for other providers
Repository: airavata
Updated Branches:
refs/heads/airavata-0.15-release-branch a6ecc7cf6 -> 23daec330
now expected stdout and stderr values are being passed to the provider,
please review for other providers
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/23daec33
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/23daec33
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/23daec33
Branch: refs/heads/airavata-0.15-release-branch
Commit: 23daec33000ec5cef1c9811630f2414cbe501059
Parents: a6ecc7c
Author: msmemon <sh...@gmail.com>
Authored: Tue Jun 30 17:59:34 2015 +0200
Committer: msmemon <sh...@gmail.com>
Committed: Tue Jun 30 17:59:34 2015 +0200
----------------------------------------------------------------------
.../airavata/gfac/bes/utils/DataTransferrer.java | 1 +
.../gfac/bes/utils/UASDataStagingProcessor.java | 5 -----
.../apache/airavata/gfac/core/cpi/BetterGfacImpl.java | 14 ++++++++++----
3 files changed, 11 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/23daec33/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/utils/DataTransferrer.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/utils/DataTransferrer.java b/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/utils/DataTransferrer.java
index 0c6b7a2..4331f17 100644
--- a/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/utils/DataTransferrer.java
+++ b/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/utils/DataTransferrer.java
@@ -75,6 +75,7 @@ public class DataTransferrer {
String stdout = jobContext.getStandardOutput();
String stderr = jobContext.getStandardError();
+
if(stdout != null) {
stdout = stdout.substring(stdout.lastIndexOf('/')+1);
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/23daec33/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/utils/UASDataStagingProcessor.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/utils/UASDataStagingProcessor.java b/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/utils/UASDataStagingProcessor.java
index 0b6d62c..efb6eba 100644
--- a/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/utils/UASDataStagingProcessor.java
+++ b/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/utils/UASDataStagingProcessor.java
@@ -146,14 +146,9 @@ public class UASDataStagingProcessor {
createInURISMSElement(value, smsUrl, input.getValue(), false);
}
else if(input.getType().equals(DataType.STRING) && input.isDataStaged()){
- System.out.println("INPUT DATA VALUE-SBZ: "+input.getValue());
- System.out.println("INPUT DATA flag-SBZ: "+input.isDataStaged());
-
createInURISMSElement(value, smsUrl, input.getValue(), false);
}
else if(input.getType().equals(DataType.STRING) && !input.isDataStaged()){
- System.out.println("INPUT DATA value for arg-SBZ: "+input.getValue());
- System.out.println("INPUT DATA flag for arg-SBZ: "+input.isDataStaged());
ApplicationProcessor.addApplicationArgument(value, context, input.getValue());
}
else if (input.getType().equals(DataType.FLOAT) || input.getType().equals(DataType.INTEGER)){
http://git-wip-us.apache.org/repos/asf/airavata/blob/23daec33/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 d95750f..d6f68be 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,21 +382,27 @@ public class BetterGfacImpl implements GFac {
}
if (objectType.getType() == DataType.STDOUT) {
String stdout = objectType.getValue();
+ String stdoutLocation = null;
if(objectType.getValue() == null || "".equals(objectType.getValue())) {
- objectType.setValue(jobExecutionContext.getOutputDir() + File.separator + jobExecutionContext.getApplicationName() + ".stdout");
+ stdoutLocation = jobExecutionContext.getOutputDir() + File.separator + jobExecutionContext.getApplicationName() + ".stdout";
}
else {
- objectType.setValue(jobExecutionContext.getOutputDir() + File.separator + stdout);
+ stdoutLocation = jobExecutionContext.getOutputDir() + File.separator + stdout;
}
+ objectType.setValue(stdoutLocation);
+ jobExecutionContext.setStandardOutput(stdoutLocation);
}
if (objectType.getType() == DataType.STDERR) {
String stderr = objectType.getValue();
+ String stderrLocation = null;
if(stderr == null || "".equals(stderr)) {
- objectType.setValue(jobExecutionContext.getOutputDir() + File.separator + jobExecutionContext.getApplicationName() + ".stderr");
+ stderrLocation = jobExecutionContext.getOutputDir() + File.separator + jobExecutionContext.getApplicationName() + ".stderr";
}
else {
- objectType.setValue(jobExecutionContext.getOutputDir() + File.separator + stderr);
+ stderrLocation = jobExecutionContext.getOutputDir() + File.separator + stderr;
}
+ objectType.setValue(stderrLocation);
+ jobExecutionContext.setStandardError(stderrLocation);
}
}
jobExecutionContext.setOutMessageContext(new MessageContext(GFacUtils.getOuputParamMap(taskOutputs)));