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/26 21:49:59 UTC
airavata git commit: fixing cancelled
Repository: airavata
Updated Branches:
refs/heads/master 9f3d55bdd -> c538ebfeb
fixing cancelled
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c538ebfe
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c538ebfe
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c538ebfe
Branch: refs/heads/master
Commit: c538ebfeb59b43673c22cdf8b19fcf2ae96e66e8
Parents: 9f3d55b
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Tue May 26 15:49:50 2015 -0400
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Tue May 26 15:49:50 2015 -0400
----------------------------------------------------------------------
.../org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/c538ebfe/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 bf0e42e..2cd9ecb 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
@@ -568,11 +568,12 @@ public class BetterGfacImpl implements GFac,Watcher {
jobExecutionContext.getNotifier().publish(new ExecutionFailEvent(e.getCause()));
throw new GFacException(e.getMessage(), e);
}
- }else if (gfacExpState == GfacExperimentState.INHANDLERSINVOKING || gfacExpState == GfacExperimentState.INHANDLERSINVOKED || gfacExpState == GfacExperimentState.OUTHANDLERSINVOKING){
- log.info("Experiment should be immedietly cancelled");
- GFacUtils.updateExperimentStatus(jobExecutionContext.getExperimentID(), ExperimentState.CANCELED);
-
}
+// else if (gfacExpState == GfacExperimentState.INHANDLERSINVOKING || gfacExpState == GfacExperimentState.INHANDLERSINVOKED || gfacExpState == GfacExperimentState.OUTHANDLERSINVOKING){
+// log.info("Experiment should be immedietly cancelled");
+// GFacUtils.updateExperimentStatus(jobExecutionContext.getExperimentID(), ExperimentState.CANCELED);
+//
+// }
return true;
}catch(Exception e){
log.error("Error occured while cancelling job for experiment : " + jobExecutionContext.getExperimentID(), e);