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/21 19:33:35 UTC
[1/2] git commit: Fixing airavata-1229
Repository: airavata
Updated Branches:
refs/heads/master 4792e8138 -> b04cbe950
Fixing airavata-1229
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/76d9108c
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/76d9108c
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/76d9108c
Branch: refs/heads/master
Commit: 76d9108ce80ca98e9b7177361b14f1b3f81c0abb
Parents: c272669
Author: lahiru <la...@apache.org>
Authored: Wed May 21 12:48:38 2014 -0400
Committer: lahiru <la...@apache.org>
Committed: Wed May 21 12:48:38 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/airavata/gfac/core/cpi/GFacImpl.java | 11 +++++++++++
.../orchestrator/server/OrchestratorServerHandler.java | 4 ++++
2 files changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/76d9108c/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/GFacImpl.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/GFacImpl.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/GFacImpl.java
index dca4684..0ecd4d7 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/GFacImpl.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/GFacImpl.java
@@ -429,6 +429,17 @@ public class GFacImpl implements GFac {
throw new GFacException("Error Executing a OutFlow Handler", e);
}
}
+ // At this point all the execution is finished so we update the task and experiment statuses.
+ // Handler authors does not have to worry about updating experiment or task statuses.
+ monitorPublisher.publish(new
+ ExperimentStatusChangeRequest(new ExperimentIdentity(jobExecutionContext.getExperimentID()),
+ ExperimentState.COMPLETED));
+ // Updating the task status if there's any task associated
+ monitorPublisher.publish(new TaskStatusChangeRequest(
+ new TaskIdentity(jobExecutionContext.getExperimentID(),
+ jobExecutionContext.getWorkflowNodeDetails().getNodeInstanceId(),
+ jobExecutionContext.getTaskData().getTaskID()), TaskState.COMPLETED
+ ));
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/76d9108c/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java b/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
index 97546ba..db4d917 100644
--- a/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
+++ b/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
@@ -106,6 +106,10 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface {
}
} catch (Exception e) {
+ // Here we really do not have to do much because only potential failure can happen
+ // is in gfac, if there are errors in gfac, it will handle the experiment/task/job statuses
+ // We might get failures in registry access before submitting the jobs to gfac, in that case we
+ // leave the status of these as created.
throw new TException(e);
}
return true;
[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/b04cbe95
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b04cbe95
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b04cbe95
Branch: refs/heads/master
Commit: b04cbe9509b4947454e577e57d5e17c17844b0da
Parents: 76d9108 4792e81
Author: lahiru <la...@apache.org>
Authored: Wed May 21 13:33:17 2014 -0400
Committer: lahiru <la...@apache.org>
Committed: Wed May 21 13:33:17 2014 -0400
----------------------------------------------------------------------
.../apache/airavata/gfac/local/provider/impl/LocalProvider.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------