You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sh...@apache.org on 2015/07/10 22:17:11 UTC
[3/4] airavata git commit: Moved experiment status publisher code
from inner class to base class
Moved experiment status publisher code from inner class to base class
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/551c3787
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/551c3787
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/551c3787
Branch: refs/heads/master
Commit: 551c378755130f6888aa577c0d42c74d04168bbb
Parents: 01d46f4
Author: Shameera Rathanyaka <sh...@gmail.com>
Authored: Fri Jul 10 16:16:30 2015 -0400
Committer: Shameera Rathanyaka <sh...@gmail.com>
Committed: Fri Jul 10 16:16:30 2015 -0400
----------------------------------------------------------------------
.../server/OrchestratorServerHandler.java | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/551c3787/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java b/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
index 1f1afd7..404e0c2 100644
--- a/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
+++ b/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
@@ -141,6 +141,13 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface {
if (executionType == ExperimentType.SINGLE_APPLICATION) {
//its an single application execution experiment
log.debug(experimentId, "Launching single application experiment {}.", experimentId);
+ ExperimentStatusChangeEvent event = new ExperimentStatusChangeEvent(ExperimentState.LAUNCHED,
+ experimentId,
+ gatewayId);
+ String messageId = AiravataUtils.getId("EXPERIMENT");
+ MessageContext messageContext = new MessageContext(event, MessageType.EXPERIMENT, messageId, gatewayId);
+ messageContext.setUpdatedTime(AiravataUtils.getCurrentTimestamp());
+ publisher.publish(messageContext);
OrchestratorServerThreadPoolExecutor.getCachedThreadPool().execute(new SingleAppExperimentRunner(experimentId, token));
} else if (executionType == ExperimentType.WORKFLOW) {
//its a workflow execution experiment
@@ -445,13 +452,7 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface {
if (gatewayId == null || gatewayId.isEmpty()) {
gatewayId = ServerSettings.getDefaultUserGateway();
}
- ExperimentStatusChangeEvent event = new ExperimentStatusChangeEvent(ExperimentState.LAUNCHED,
- experimentId,
- gatewayId);
- String messageId = AiravataUtils.getId("EXPERIMENT");
- MessageContext messageContext = new MessageContext(event, MessageType.EXPERIMENT, messageId, gatewayId);
- messageContext.setUpdatedTime(AiravataUtils.getCurrentTimestamp());
- publisher.publish(messageContext);
+
launchProcess(processId, airavataCredStoreToken);
}