airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject airavata git commit: ack when cancelled
Date Mon, 11 May 2015 18:33:47 GMT
Repository: airavata
Updated Branches:
  refs/heads/master b643ea58f -> e9a451dc0


ack when cancelled


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/e9a451dc
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e9a451dc
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e9a451dc

Branch: refs/heads/master
Commit: e9a451dc07fa7756e05c551579a1dff0828cbb15
Parents: b643ea5
Author: Chathuri Wimalasena <chathuri@apache.org>
Authored: Mon May 11 14:33:41 2015 -0400
Committer: Chathuri Wimalasena <chathuri@apache.org>
Committed: Mon May 11 14:33:41 2015 -0400

----------------------------------------------------------------------
 .../api/server/listener/AiravataExperimentStatusUpdator.java      | 3 ++-
 pom.xml                                                           | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/e9a451dc/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/listener/AiravataExperimentStatusUpdator.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/listener/AiravataExperimentStatusUpdator.java
b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/listener/AiravataExperimentStatusUpdator.java
index 0d779b4..5543d62 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/listener/AiravataExperimentStatusUpdator.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/listener/AiravataExperimentStatusUpdator.java
@@ -77,10 +77,11 @@ public class AiravataExperimentStatusUpdator implements AbstractActivityListener
             String experimentNode = ServerSettings.getSetting(Constants.ZOOKEEPER_GFAC_EXPERIMENT_NODE,
"/gfac-experiments");
             String experimentPath = experimentNode + File.separator + ServerSettings.getSetting(Constants.ZOOKEEPER_GFAC_SERVER_NAME)
                     + File.separator + nodeStatus.getWorkflowNodeIdentity().getExperimentId();
-	        ExperimentState state = ExperimentState.UNKNOWN;
+	        ExperimentState state;
 	        switch (nodeStatus.getState()) {
 	            case CANCELED:
 	                state = ExperimentState.CANCELED; updateExperimentStatus = true;
+                    cleanup(nodeStatus, experimentNode, experimentPath);
 	                break;
 	            case COMPLETED:
 	            	if(executionType.equals(ExecutionType.SINGLE_APP)){

http://git-wip-us.apache.org/repos/asf/airavata/blob/e9a451dc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7655b49..029f377 100644
--- a/pom.xml
+++ b/pom.xml
@@ -544,7 +544,7 @@
 				<module>modules/test-suite</module>
 				<module>modules/distribution</module>
 				<module>modules/messaging</module>
-				<module>modules/integration-tests</module>
+				<!--<module>modules/integration-tests</module>-->
 				<module>modules/workflow</module>
 				<module>modules/xbaya-gui</module>
 			</modules>


Mime
View raw message