Repository: airavata Updated Branches: refs/heads/develop 199c30107 -> 6c483bc4c
Fixed experiment lauch error with unicore Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/24421596 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/24421596 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/24421596 Branch: refs/heads/develop Commit: 244215968409100ebccef0425c505ac7f6e52fc1 Parents: 6c5645d Author: Shameera Rathnayaka <[email protected]> Authored: Wed Mar 23 11:26:28 2016 -0400 Committer: Shameera Rathnayaka <[email protected]> Committed: Wed Mar 23 11:26:28 2016 -0400 ---------------------------------------------------------------------- .../orchestrator/cpi/impl/SimpleOrchestratorImpl.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/24421596/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 427be5b..15c8556 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 @@ -284,14 +284,15 @@ public class SimpleOrchestratorImpl extends AbstractOrchestrator{ } ComputeResourceDescription computeResource = appCatalog.getComputeResource().getComputeResource(resourceHostId); JobSubmissionInterface preferredJobSubmissionInterface = OrchestratorUtils.getPreferredJobSubmissionInterface(orchestratorContext, processModel, gatewayId); - List<String> taskIdList = createAndSaveEnvSetupTask(gatewayId, processModel, experimentCatalog); - ComputeResourcePreference resourcePreference = OrchestratorUtils.getComputeResourcePreference(orchestratorContext, processModel, gatewayId); + List<String> taskIdList = new ArrayList<>(); + if (resourcePreference.getPreferredJobSubmissionProtocol() == JobSubmissionProtocol.UNICORE) { + // TODO - breakdown unicore all in one task to multiple tasks, then we don't need to handle UNICORE here. taskIdList.addAll(createAndSaveSubmissionTasks(gatewayId, preferredJobSubmissionInterface, processModel, userGivenWallTime)); } else { + taskIdList.addAll(createAndSaveEnvSetupTask(gatewayId, processModel, experimentCatalog)); taskIdList.addAll(createAndSaveInputDataStagingTasks(processModel, gatewayId)); - if (autoSchedule) { List<BatchQueue> definedBatchQueues = computeResource.getBatchQueues(); for (BatchQueue batchQueue : definedBatchQueues) { @@ -316,10 +317,8 @@ public class SimpleOrchestratorImpl extends AbstractOrchestrator{ } else { taskIdList.addAll(createAndSaveSubmissionTasks(gatewayId,preferredJobSubmissionInterface, processModel, userGivenWallTime)); } - taskIdList.addAll(createAndSaveOutputDataStagingTasks(processModel, gatewayId)); } - // update process scheduling experimentCatalog.update(ExperimentCatalogModelType.PROCESS, processModel, processModel.getProcessId()); return getTaskDag(taskIdList);
