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 21:11:41 UTC
airavata git commit: error state from experiment status updater
Repository: airavata
Updated Branches:
refs/heads/master 16b58b8c8 -> 2fe26fb6e
error state from experiment status updater
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/2fe26fb6
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/2fe26fb6
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/2fe26fb6
Branch: refs/heads/master
Commit: 2fe26fb6ec643ec694cab016c67f1d76ca6605bf
Parents: 16b58b8
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Wed May 13 15:11:38 2015 -0400
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Wed May 13 15:11:38 2015 -0400
----------------------------------------------------------------------
.../api/server/listener/AiravataExperimentStatusUpdator.java | 2 +-
.../airavata/orchestrator/server/OrchestratorServerHandler.java | 5 -----
2 files changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/2fe26fb6/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 6c2acfc..70a3f94 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
@@ -93,7 +93,7 @@ public class AiravataExperimentStatusUpdator implements AbstractActivityListener
clean = true;
break;
case INVOKED:
- state = ExperimentState.LAUNCHED; updateExperimentStatus = false;
+ state = ExperimentState.EXECUTING; updateExperimentStatus = false;
break;
case FAILED:
state = ExperimentState.FAILED; updateExperimentStatus = true;
http://git-wip-us.apache.org/repos/asf/airavata/blob/2fe26fb6/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 f903373..1b3e1f3 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
@@ -702,11 +702,6 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface,
log.errorId(experimentId, "Error retrieving the Experiment by the given experimentID: {}", experimentId);
return false;
}
- ExperimentStatus status = new ExperimentStatus();
- status.setExperimentState(ExperimentState.LAUNCHED);
- status.setTimeOfStateChange(Calendar.getInstance().getTimeInMillis());
- experiment.setExperimentStatus(status);
- registry.update(RegistryModelType.EXPERIMENT_STATUS, status, experimentId);
String gatewayId = null;
CredentialReader credentialReader = GFacUtils.getCredentialReader();
if (credentialReader != null) {