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/05/13 22:48:16 UTC
airavata git commit: cancel when provider invoked
Repository: airavata
Updated Branches:
refs/heads/master fea3325f7 -> 0140ce72c
cancel when provider invoked
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/0140ce72
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/0140ce72
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/0140ce72
Branch: refs/heads/master
Commit: 0140ce72cb8f56f8c0cc6049071682d52aecf06a
Parents: fea3325
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Wed May 13 16:48:11 2015 -0400
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Wed May 13 16:48:11 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/0140ce72/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 455c0d4..6f83eb2 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
@@ -570,7 +570,8 @@ public class BetterGfacImpl implements GFac,Watcher {
}
// Register log event listener. This is required in all scenarios.
jobExecutionContext.getNotificationService().registerListener(new LoggingListener());
- if (gfacExpState == GfacExperimentState.PROVIDERINVOKING) { // we already have changed registry status, we need to handle job canceling scenario.
+ if (gfacExpState == GfacExperimentState.PROVIDERINVOKING || gfacExpState == GfacExperimentState.JOBSUBMITTED
+ || gfacExpState == GfacExperimentState.PROVIDERINVOKED) { // we already have changed registry status, we need to handle job canceling scenario.
log.info("Job is in a position to perform a proper cancellation");
try {
Scheduler.schedule(jobExecutionContext);