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/07 21:18:20 UTC
airavata git commit: Added compute resource id to process model and
rename launchExperiment method to launchProcess
Repository: airavata
Updated Branches:
refs/heads/master 51befd7cc -> 25a389537
Added compute resource id to process model and rename launchExperiment method to launchProcess
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/25a38953
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/25a38953
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/25a38953
Branch: refs/heads/master
Commit: 25a38953744659d01bec37b69ff4ccead34fb97d
Parents: 51befd7
Author: Shameera Rathanyaka <sh...@gmail.com>
Authored: Tue Jul 7 15:18:11 2015 -0400
Committer: Shameera Rathanyaka <sh...@gmail.com>
Committed: Tue Jul 7 15:18:11 2015 -0400
----------------------------------------------------------------------
.../apache/airavata/orchestrator/cpi/Orchestrator.java | 11 ++++++-----
.../orchestrator/cpi/impl/SimpleOrchestratorImpl.java | 6 ++----
.../airavata/orchestrator/core/NewOrchestratorTest.java | 2 +-
.../orchestrator/core/OrchestratorTestWithGRAM.java | 2 +-
.../core/OrchestratorTestWithMyProxyAuth.java | 2 +-
.../orchestrator/server/OrchestratorServerHandler.java | 10 ++++++----
6 files changed, 17 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/25a38953/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/Orchestrator.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/Orchestrator.java b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/Orchestrator.java
index d155a5e..76fb3e5 100644
--- a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/Orchestrator.java
+++ b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/Orchestrator.java
@@ -43,19 +43,20 @@ public interface Orchestrator {
ValidationResults validateExperiment(ExperimentModel experiment, ProcessModel processModel) throws OrchestratorException,LaunchValidationException;
/**
* After creating the experiment Data user have the
- * experimentID as the handler to the experiment, during the launchExperiment
+ * experimentID as the handler to the experiment, during the launchProcess
* We just have to give the experimentID
*
- * @param experiment
- * @return launchExperiment status
+ * @param processModel - Process model created for this process.
+ * @param tokenId - token id for this request.
+ * @return launchProcess status
* @throws OrchestratorException
*/
- boolean launchExperiment(ExperimentModel experiment, ProcessModel processModel,String tokenId) throws OrchestratorException;
+ boolean launchProcess(ProcessModel processModel, String tokenId) throws OrchestratorException;
/**
* After creating the experiment Data user have the
- * experimentID as the handler to the experiment, during the launchExperiment
+ * experimentID as the handler to the experiment, during the launchProcess
* We just have to give the experimentID
*
* @param experiment
http://git-wip-us.apache.org/repos/asf/airavata/blob/25a38953/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java
index eba8320..cf220e4 100644
--- a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java
+++ b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java
@@ -67,11 +67,9 @@ public class SimpleOrchestratorImpl extends AbstractOrchestrator{
}
}
- public boolean launchExperiment(ExperimentModel experiment, ProcessModel processModel, String tokenId) throws OrchestratorException {
- String experimentId = experiment.getExperimentId();
- String processId = processModel.getProcessId();
+ public boolean launchProcess(ProcessModel processModel, String tokenId) throws OrchestratorException {
try {
- return jobSubmitter.submit(experimentId, processId, tokenId);
+ return jobSubmitter.submit(processModel.getExperimentId(), processModel.getProcessId(), tokenId);
} catch (Exception e) {
throw new OrchestratorException("Error launching the job", e);
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/25a38953/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/NewOrchestratorTest.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/NewOrchestratorTest.java b/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/NewOrchestratorTest.java
index f973b3e..196418a 100644
--- a/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/NewOrchestratorTest.java
+++ b/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/NewOrchestratorTest.java
@@ -77,7 +77,7 @@ public class NewOrchestratorTest extends BaseOrchestratorTest {
// simpleExperiment.setExperimentID(experimentId);
// tasks = orchestrator.createTasks(experimentId);
// for(TaskDetails details:tasks) {
-// orchestrator.launchExperiment(simpleExperiment,test, details,null);
+// orchestrator.launchProcess(simpleExperiment,test, details,null);
// }
// }
//
http://git-wip-us.apache.org/repos/asf/airavata/blob/25a38953/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/OrchestratorTestWithGRAM.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/OrchestratorTestWithGRAM.java b/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/OrchestratorTestWithGRAM.java
index d9007ed..e323680 100644
--- a/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/OrchestratorTestWithGRAM.java
+++ b/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/OrchestratorTestWithGRAM.java
@@ -67,7 +67,7 @@ public class OrchestratorTestWithGRAM extends BaseOrchestratorTest {
// @Test
// public void noDescriptorTest() throws Exception {
//
-//// boolean b = orchestrator.launchExperiment(experimentID);
+//// boolean b = orchestrator.launchProcess(experimentID);
////
//// if (b) {
//// Assert.assertTrue(true);
http://git-wip-us.apache.org/repos/asf/airavata/blob/25a38953/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/OrchestratorTestWithMyProxyAuth.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/OrchestratorTestWithMyProxyAuth.java b/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/OrchestratorTestWithMyProxyAuth.java
index c9db048..2332061 100644
--- a/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/OrchestratorTestWithMyProxyAuth.java
+++ b/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/OrchestratorTestWithMyProxyAuth.java
@@ -75,7 +75,7 @@ public class OrchestratorTestWithMyProxyAuth extends BaseOrchestratorTest {
//
// for (TaskDetails taskDetail: tasks)
// {
-// orchestrator.launchExperiment(simpleExperiment,test, taskDetail,null);
+// orchestrator.launchProcess(simpleExperiment,test, taskDetail,null);
// }
// }
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/25a38953/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 f363f73..1f1afd7 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
@@ -37,6 +37,7 @@ import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescr
import org.apache.airavata.model.error.LaunchValidationException;
import org.apache.airavata.model.experiment.ExperimentModel;
import org.apache.airavata.model.experiment.ExperimentType;
+import org.apache.airavata.model.experiment.UserConfigurationDataModel;
import org.apache.airavata.model.messaging.event.ExperimentStatusChangeEvent;
import org.apache.airavata.model.messaging.event.MessageType;
import org.apache.airavata.model.process.ProcessModel;
@@ -108,7 +109,7 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface {
/**
* * After creating the experiment Data user have the * experimentID as the
- * handler to the experiment, during the launchExperiment * We just have to
+ * handler to the experiment, during the launchProcess * We just have to
* give the experimentID * * @param experimentID * @return sucess/failure *
* *
*
@@ -217,17 +218,18 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface {
try {
ProcessModel processModel = (ProcessModel) experimentCatalog.get(
ExperimentCatalogModelType.PROCESS, processId);
- String experimentId = processModel.getExperimentId();
- ExperimentModel experimentModel = (ExperimentModel)experimentCatalog.get(ExperimentCatalogModelType.EXPERIMENT, experimentId);
String applicationId = processModel.getApplicationInterfaceId();
if (applicationId == null) {
log.error(processId, "Application interface id shouldn't be null.");
throw new OrchestratorException("Error executing the job, application interface id shouldn't be null.");
}
+ // set application deployment id to process model
ApplicationDeploymentDescription applicationDeploymentDescription = getAppDeployment(processModel, applicationId);
processModel.setApplicationDeploymentId(applicationDeploymentDescription.getAppDeploymentId());
+ // set compute resource id to process model, default we set the same in the user preferred compute host id
+ processModel.setComputeResourceId(processModel.getResourceSchedule().getResourceHostId());
experimentCatalog.update(ExperimentCatalogModelType.PROCESS, processModel,processModel.getProcessId());
- return orchestrator.launchExperiment(experimentModel, processModel, airavataCredStoreToken);
+ return orchestrator.launchProcess(processModel, airavataCredStoreToken);
} catch (Exception e) {
log.error(processId, "Error while launching process ", e);
throw new TException(e);