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:09 UTC
[1/4] airavata git commit: fixed amqp publisher issues
Repository: airavata
Updated Branches:
refs/heads/master aa86a7e6e -> abc42f690
fixed amqp publisher issues
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/e0aa7173
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e0aa7173
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e0aa7173
Branch: refs/heads/master
Commit: e0aa71735a1de1f7f9e6d42910b860e3146fa694
Parents: aa86a7e
Author: Shameera Rathanyaka <sh...@gmail.com>
Authored: Fri Jul 10 16:14:31 2015 -0400
Committer: Shameera Rathanyaka <sh...@gmail.com>
Committed: Fri Jul 10 16:14:31 2015 -0400
----------------------------------------------------------------------
.../apache/airavata/gfac/core/GFacUtils.java | 21 +++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/e0aa7173/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
index 9d7bb2d..1b58730 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
@@ -248,9 +248,10 @@ public class GFacUtils {
JobIdentifier identifier = new JobIdentifier(jobModel.getJobId(), taskContext.getTaskModel().getTaskId(),
processContext.getProcessId(), processContext.getProcessModel().getExperimentId(),
processContext.getGatewayId());
- JobStatusChangeRequestEvent jobStatusChangeRequestEvent = new JobStatusChangeRequestEvent(state, identifier);
- MessageContext msgCtx = new MessageContext(jobStatusChangeRequestEvent, MessageType.JOB, jobModel.getJobId
- (), taskContext.getParentProcessContext().getGatewayId());
+ JobStatusChangeEvent jobStatusChangeEvent = new JobStatusChangeEvent(state, identifier);
+ MessageContext msgCtx = new MessageContext(jobStatusChangeEvent, MessageType.JOB, AiravataUtils.getId
+ (MessageType.JOB.name()), taskContext.getParentProcessContext().getGatewayId());
+ msgCtx.setUpdatedTime(AiravataUtils.getCurrentTimestamp());
processContext.getStatusPublisher().publish(msgCtx);
} catch (Exception e) {
throw new GFacException("Error persisting job status"
@@ -272,10 +273,11 @@ public class GFacUtils {
TaskIdentifier identifier = new TaskIdentifier(taskContext.getTaskId(),
processContext.getProcessId(), processContext.getProcessModel().getExperimentId(),
processContext.getGatewayId());
- TaskStatusChangeRequestEvent taskStatusChangeRequestEvent = new TaskStatusChangeRequestEvent(state,
+ TaskStatusChangeEvent taskStatusChangeEvent = new TaskStatusChangeEvent(state,
identifier);
- MessageContext msgCtx = new MessageContext(taskStatusChangeRequestEvent, MessageType.TASK, taskContext
- .getTaskId(), taskContext.getParentProcessContext().getGatewayId());
+ MessageContext msgCtx = new MessageContext(taskStatusChangeEvent, MessageType.TASK, AiravataUtils.getId
+ (MessageType.TASK.name()), taskContext.getParentProcessContext().getGatewayId());
+ msgCtx.setUpdatedTime(AiravataUtils.getCurrentTimestamp());
processContext.getStatusPublisher().publish(msgCtx);
} catch (Exception e) {
throw new GFacException("Error persisting task status"
@@ -296,9 +298,10 @@ public class GFacUtils {
ProcessIdentifier identifier = new ProcessIdentifier(processContext.getProcessId(),
processContext.getProcessModel().getExperimentId(),
processContext.getGatewayId());
- ProcessStatusChangeRequestEvent processStatusChangeRequestEvent = new ProcessStatusChangeRequestEvent(state, identifier);
- MessageContext msgCtx = new MessageContext(processStatusChangeRequestEvent, MessageType.PROCESS,
- processContext.getProcessId(), processContext.getGatewayId());
+ ProcessStatusChangeEvent processStatusChangeEvent = new ProcessStatusChangeEvent(state, identifier);
+ MessageContext msgCtx = new MessageContext(processStatusChangeEvent, MessageType.PROCESS,
+ AiravataUtils.getId(MessageType.PROCESS.name()), processContext.getGatewayId());
+ msgCtx.setUpdatedTime(AiravataUtils.getCurrentTimestamp());
processContext.getStatusPublisher().publish(msgCtx);
} catch (Exception e) {
throw new GFacException("Error persisting process status"
[4/4] airavata git commit: Set jobModel properties
Posted by sh...@apache.org.
Set jobModel properties
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/abc42f69
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/abc42f69
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/abc42f69
Branch: refs/heads/master
Commit: abc42f690b5b833fff4b36c590bbe8a4ec26a213
Parents: 551c378
Author: Shameera Rathanyaka <sh...@gmail.com>
Authored: Fri Jul 10 16:17:02 2015 -0400
Committer: Shameera Rathanyaka <sh...@gmail.com>
Committed: Fri Jul 10 16:17:02 2015 -0400
----------------------------------------------------------------------
.../org/apache/airavata/gfac/impl/task/SSHJobSubmissionTask.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/abc42f69/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SSHJobSubmissionTask.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SSHJobSubmissionTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SSHJobSubmissionTask.java
index 24a9238..ff3a6f8 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SSHJobSubmissionTask.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SSHJobSubmissionTask.java
@@ -22,6 +22,7 @@
package org.apache.airavata.gfac.impl.task;
import org.apache.airavata.common.exception.ApplicationSettingsException;
+import org.apache.airavata.common.utils.AiravataUtils;
import org.apache.airavata.gfac.core.*;
import org.apache.airavata.gfac.core.cluster.RemoteCluster;
import org.apache.airavata.gfac.core.context.ProcessContext;
@@ -58,6 +59,9 @@ public class SSHJobSubmissionTask implements JobSubmissionTask {
JobModel jobModel = processContext.getJobModel();
if (jobModel == null){
jobModel = new JobModel();
+ jobModel.setWorkingDir(processContext.getWorkingDir());
+ jobModel.setTaskId(taskContext.getTaskId());
+ jobModel.setCreationTime(AiravataUtils.getCurrentTimestamp().getTime());
}
RemoteCluster remoteCluster = processContext.getRemoteCluster();
JobDescriptor jobDescriptor = GFacUtils.createJobDescriptor(processContext);
[2/4] airavata git commit: Added missing properties of registry save
and get operations
Posted by sh...@apache.org.
Added missing properties of registry save and get operations
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/01d46f4f
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/01d46f4f
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/01d46f4f
Branch: refs/heads/master
Commit: 01d46f4fc0321de66b2eb6524399820508a0a4f4
Parents: e0aa717
Author: Shameera Rathanyaka <sh...@gmail.com>
Authored: Fri Jul 10 16:15:27 2015 -0400
Committer: Shameera Rathanyaka <sh...@gmail.com>
Committed: Fri Jul 10 16:15:27 2015 -0400
----------------------------------------------------------------------
.../catalog/impl/ExperimentRegistry.java | 28 +++++---------------
.../catalog/resources/TaskStatusResource.java | 3 ++-
.../experiment/catalog/resources/Utils.java | 1 +
3 files changed, 10 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/01d46f4f/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
index 667c42d..1a2eacf 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
@@ -76,8 +76,8 @@ public class ExperimentRegistry {
logger.error("Project does not exist in the system..");
throw new Exception("Project does not exist in the system, Please create the project first...");
}
- experimentId = getExperimentID(experiment.getExperimentName());
- experiment.setExperimentId(experimentId);
+ experimentId = AiravataUtils.getId(experiment.getExperimentName());
+ experiment.setExperimentId(experimentId);
ExperimentResource experimentResource = new ExperimentResource();
experimentResource.setExperimentId(experimentId);
experimentResource.setProjectId(experiment.getProjectId());
@@ -245,8 +245,8 @@ public class ExperimentRegistry {
try {
ProcessResource processResource = new ProcessResource();
- String processId = getProcessID(expId);
- process.setProcessId(processId);
+ String processId = AiravataUtils.getId("PROCESS");
+ process.setProcessId(processId);
processResource.setProcessId(processId);
processResource.setExperimentId(expId);
processResource.setCreationTime(AiravataUtils.getTime(process.getCreationTime()));
@@ -409,7 +409,7 @@ public class ExperimentRegistry {
public String addTask(TaskModel task, String processID) throws RegistryException {
try {
TaskResource taskResource = new TaskResource();
- task.setTaskId(getTaskID(processID));
+ task.setTaskId(AiravataUtils.getId("TASK"));
taskResource.setTaskId(task.getTaskId());
taskResource.setParentProcessId(task.getParentProcessId());
taskResource.setTaskType(task.getTaskType().toString());
@@ -421,7 +421,8 @@ public class ExperimentRegistry {
TaskStatus taskStatus = new TaskStatus();
taskStatus.setState(TaskState.CREATED);
- addTaskStatus(taskStatus, task.getTaskId());
+ taskStatus.setTimeOfStateChange(AiravataUtils.getCurrentTimestamp().getTime());
+ addTaskStatus(taskStatus, task.getTaskId());
if(task.getTaskError() != null) {
addTaskError(task.getTaskError(), task.getTaskId());
@@ -1514,21 +1515,6 @@ public class ExperimentRegistry {
}
}
- public String getExperimentID(String experimentName) {
- String exp = experimentName.replaceAll("\\s", "");
- return exp + "_" + UUID.randomUUID();
- }
-
- public String getProcessID(String experimentId) {
- String process = experimentId.replaceAll("\\s", "");
- return process + "_" + UUID.randomUUID();
- }
-
- public String getTaskID(String processId) {
- String taskId = processId.replaceAll("\\s", "");
- return taskId + "_" + UUID.randomUUID();
- }
-
public String getStatusID(String parentId) {
String status = parentId.replaceAll("\\s", "");
return status + "_" + UUID.randomUUID();
http://git-wip-us.apache.org/repos/asf/airavata/blob/01d46f4f/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/TaskStatusResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/TaskStatusResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/TaskStatusResource.java
index 85c9eb9..4f4ff7a 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/TaskStatusResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/TaskStatusResource.java
@@ -126,7 +126,8 @@ public class TaskStatusResource extends AbstractExpCatResource {
taskStatus.setTaskId(taskId);
taskStatus.setState(state);
taskStatus.setReason(reason);
- em.persist(taskStatus);
+ taskStatus.setTimeOfStateChange(timeOfStateChange);
+ em.persist(taskStatus);
em.getTransaction().commit();
em.close();
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/01d46f4f/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java
index 97bca6f..14d5424 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java
@@ -599,6 +599,7 @@ public class Utils {
if (o != null){
taskStatusResource.setTaskId(o.getTaskId());
taskStatusResource.setState(o.getState());
+ taskStatusResource.setStatusId(o.getStatusId());
taskStatusResource.setTimeOfStateChange(o.getTimeOfStateChange());
taskStatusResource.setReason(o.getReason());
}
[3/4] airavata git commit: Moved experiment status publisher code
from inner class to base class
Posted by sh...@apache.org.
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);
}