You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2015/06/07 19:01:06 UTC
[25/44] airavata git commit: fixing merge failures
fixing merge failures
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/7e97f09a
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7e97f09a
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7e97f09a
Branch: refs/heads/mongo-registry
Commit: 7e97f09a9ccd92ad1648bde1047f3f0952f472a2
Parents: 945161e 94a20ab
Author: Supun Nakandala <sc...@apache.org>
Authored: Wed May 27 23:20:38 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Wed May 27 23:20:38 2015 +0530
----------------------------------------------------------------------
.../client/samples/CreateLaunchExperiment.java | 46 ++++++--------------
.../tools/RegisterSampleApplications.java | 2 +-
.../airavata/gfac/core/cpi/BetterGfacImpl.java | 1 -
3 files changed, 14 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7e97f09a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7e97f09a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
----------------------------------------------------------------------
diff --cc modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
index 3aa2c8d,2cd9ecb..f62a9e0
--- 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,14 -568,15 +570,13 @@@ public class BetterGfacImpl implements
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);
+ log.error("Error occured while cancelling job for experiment : " + jobExecutionContext.getExperimentId(), e);
throw new GFacException(e.getMessage(), e);
}finally{
closeZK(jobExecutionContext);