You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2014/05/27 21:01:23 UTC
[1/2] git commit: fixing outputMessageContext issue
Repository: airavata
Updated Branches:
refs/heads/master b3f7b256f -> 1dd6486a5
fixing outputMessageContext issue
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c06bd903
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c06bd903
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c06bd903
Branch: refs/heads/master
Commit: c06bd90341b5a337e124b4a44a1bb6dee9bc15cd
Parents: 4b51e7f
Author: lahiru <la...@apache.org>
Authored: Tue May 27 15:00:40 2014 -0400
Committer: lahiru <la...@apache.org>
Committed: Tue May 27 15:00:40 2014 -0400
----------------------------------------------------------------------
.../gfac/core/monitor/AiravataExperimentStatusUpdator.java | 1 +
.../apache/airavata/gfac/gsissh/handler/GSISSHOutputHandler.java | 2 ++
.../apache/airavata/gfac/local/provider/impl/LocalProvider.java | 2 +-
.../org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java | 2 ++
4 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/c06bd903/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/AiravataExperimentStatusUpdator.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/AiravataExperimentStatusUpdator.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/AiravataExperimentStatusUpdator.java
index 4e3efa0..d7265d1 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/AiravataExperimentStatusUpdator.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/AiravataExperimentStatusUpdator.java
@@ -69,6 +69,7 @@ public class AiravataExperimentStatusUpdator implements AbstractActivityListener
status.setTimeOfStateChange(Calendar.getInstance().getTimeInMillis());
details.setExperimentStatus(status);
airavataRegistry.update(RegistryModelType.EXPERIMENT, details, experimentId);
+
}
public void setup(Object... configurations) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/c06bd903/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHOutputHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHOutputHandler.java b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHOutputHandler.java
index f8c9a20..d48f92b 100644
--- a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHOutputHandler.java
+++ b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHOutputHandler.java
@@ -166,6 +166,7 @@ public class GSISSHOutputHandler extends AbstractHandler {
List<String> outputList = cluster.listDirectory(app.getOutputDataDirectory());
if (outputList.size() == 0 || outputList.get(0).isEmpty()) {
OutputUtils.fillOutputFromStdout1(output, stdOutStr, stdErrStr, outputArray);
+ OutputUtils.fillOutputFromStdout(output, stdOutStr, stdErrStr);
break;
} else {
String valueList = outputList.get(0);
@@ -179,6 +180,7 @@ public class GSISSHOutputHandler extends AbstractHandler {
}
} else {
OutputUtils.fillOutputFromStdout1(output, stdOutStr,stdErrStr, outputArray);
+ OutputUtils.fillOutputFromStdout(output, stdOutStr, stdErrStr);
break;
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/c06bd903/modules/gfac/gfac-local/src/main/java/org/apache/airavata/gfac/local/provider/impl/LocalProvider.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-local/src/main/java/org/apache/airavata/gfac/local/provider/impl/LocalProvider.java b/modules/gfac/gfac-local/src/main/java/org/apache/airavata/gfac/local/provider/impl/LocalProvider.java
index 805f8a6..35597c4 100644
--- a/modules/gfac/gfac-local/src/main/java/org/apache/airavata/gfac/local/provider/impl/LocalProvider.java
+++ b/modules/gfac/gfac-local/src/main/java/org/apache/airavata/gfac/local/provider/impl/LocalProvider.java
@@ -207,7 +207,7 @@ public class LocalProvider extends AbstractProvider {
Map<String, Object> output = jobExecutionContext.getOutMessageContext().getParameters();
OutputUtils.fillOutputFromStdout1(output, stdOutStr, stdErrStr, outputArray);
registry.add(ChildDataType.EXPERIMENT_OUTPUT, outputArray, jobExecutionContext.getExperimentID());
-
+ OutputUtils.fillOutputFromStdout(output, stdOutStr, stdErrStr); // todo this will be replaced with app catalog
} catch (XmlException e) {
throw new GFacProviderException("Cannot read output:" + e.getMessage(), e);
} catch (IOException io) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/c06bd903/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 90622b4..bbc8b1d 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
@@ -164,6 +164,7 @@ public class SSHOutputHandler extends AbstractHandler {
List<String> outputList = cluster.listDirectory(app.getOutputDataDirectory());
if (outputList.size() == 0 || outputList.get(0).isEmpty()) {
OutputUtils.fillOutputFromStdout1(output, stdOutStr, stdErrStr,outputArray);
+ OutputUtils.fillOutputFromStdout(output, stdOutStr, stdErrStr);
break;
} else {
String valueList = outputList.get(0);
@@ -177,6 +178,7 @@ public class SSHOutputHandler extends AbstractHandler {
}
} else {
OutputUtils.fillOutputFromStdout1(output, stdOutStr, stdErrStr,outputArray);
+ OutputUtils.fillOutputFromStdout(output, stdOutStr, stdErrStr);
}
}
if (outputArray == null || outputArray.isEmpty()) {
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
Posted by la...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/1dd6486a
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/1dd6486a
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/1dd6486a
Branch: refs/heads/master
Commit: 1dd6486a5484e405f2ff1921a5893a3bbbdd61d0
Parents: c06bd90 b3f7b25
Author: lahiru <la...@apache.org>
Authored: Tue May 27 15:01:07 2014 -0400
Committer: lahiru <la...@apache.org>
Committed: Tue May 27 15:01:07 2014 -0400
----------------------------------------------------------------------
.../main/java/org/apache/airavata/gfac/core/cpi/GFacImpl.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------