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/11/03 20:48:00 UTC
[35/51] [abbrv] airavata git commit: output data staging task
output data staging task
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/88a611d2
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/88a611d2
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/88a611d2
Branch: refs/heads/master
Commit: 88a611d24800bd5b0d5769cb3dde703e717addd5
Parents: 80ac14c
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Wed Oct 21 14:22:28 2015 -0400
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Wed Oct 21 14:22:28 2015 -0400
----------------------------------------------------------------------
.../orchestrator/cpi/impl/SimpleOrchestratorImpl.java | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/88a611d2/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 2bba23f..869f65a 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
@@ -286,7 +286,7 @@ public class SimpleOrchestratorImpl extends AbstractOrchestrator{
ComputeResourceDescription computeResource = appCatalog.getComputeResource().getComputeResource(resourceHostId);
List<String> taskIdList = createAndSaveEnvSetupTask(gatewayId, processModel, experimentCatalog);
- taskIdList.addAll(createAndSaveDataStagingTasks(processModel, gatewayId));
+ taskIdList.addAll(createAndSaveInputDataStagingTasks(processModel));
if (autoSchedule) {
List<BatchQueue> definedBatchQueues = computeResource.getBatchQueues();
@@ -311,7 +311,7 @@ public class SimpleOrchestratorImpl extends AbstractOrchestrator{
} else {
taskIdList.addAll(createAndSaveSubmissionTasks(gatewayId, processModel, userGivenWallTime));
}
-
+ taskIdList.addAll(createAndSaveOutputDataStagingTasks(processModel, gatewayId));
return getTaskDag(taskIdList);
} catch (Exception e) {
throw new OrchestratorException("Error during creating process");
@@ -354,10 +354,9 @@ public class SimpleOrchestratorImpl extends AbstractOrchestrator{
return envTaskIds;
}
- public List<String> createAndSaveDataStagingTasks (ProcessModel processModel, String gatewayId) throws RegistryException {
+ public List<String> createAndSaveInputDataStagingTasks(ProcessModel processModel) throws RegistryException {
List<String> dataStagingTaskIds = new ArrayList<>();
List<InputDataObjectType> processInputs = processModel.getProcessInputs();
- List<OutputDataObjectType> processOutputs = processModel.getProcessOutputs();
sortByInputOrder(processInputs);
if (processInputs != null) {
@@ -385,6 +384,12 @@ public class SimpleOrchestratorImpl extends AbstractOrchestrator{
}
}
}
+ return dataStagingTaskIds;
+ }
+
+ public List<String> createAndSaveOutputDataStagingTasks(ProcessModel processModel, String gatewayId) throws RegistryException {
+ List<String> dataStagingTaskIds = new ArrayList<>();
+ List<OutputDataObjectType> processOutputs = processModel.getProcessOutputs();
if (processOutputs != null) {
for (OutputDataObjectType processOutput : processOutputs) {
@@ -409,7 +414,6 @@ public class SimpleOrchestratorImpl extends AbstractOrchestrator{
}
}
}
-
return dataStagingTaskIds;
}