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/11/02 21:33:00 UTC
[1/2] airavata git commit: Fixed issue with input destination
construction
Repository: airavata
Updated Branches:
refs/heads/orchestratorTaskBreakdown 2d6ee02a5 -> 85885d9cb
Fixed issue with input destination construction
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d139f697
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d139f697
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d139f697
Branch: refs/heads/orchestratorTaskBreakdown
Commit: d139f697d7a8812722a989df76199f93b813ea26
Parents: 6fc864e
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Mon Nov 2 15:32:11 2015 -0500
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Mon Nov 2 15:32:11 2015 -0500
----------------------------------------------------------------------
.../orchestrator/cpi/impl/SimpleOrchestratorImpl.java | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/d139f697/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 be65a70..61a70d1 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
@@ -509,8 +509,11 @@ public class SimpleOrchestratorImpl extends AbstractOrchestrator{
URI destination = null;
try {
DataMovementProtocol dataMovementProtocol = OrchestratorUtils.getPreferredDataMovementProtocol(orchestratorContext, processModel, gatewayId);
- destination = new URI(dataMovementProtocol.name(), computeResource.getHostName(),
- computeResourcePreference.getLoginUserName(), OrchestratorUtils.getDataMovementPort(orchestratorContext, processModel, gatewayId), remoteOutputDir , null, null);
+ destination = new URI(dataMovementProtocol.name(),
+ computeResourcePreference.getLoginUserName(),
+ computeResource.getHostName(),
+ OrchestratorUtils.getDataMovementPort(orchestratorContext, processModel, gatewayId),
+ remoteOutputDir , null, null);
} catch (URISyntaxException e) {
throw new TaskException("Error while constructing destination file URI");
}
@@ -544,8 +547,11 @@ public class SimpleOrchestratorImpl extends AbstractOrchestrator{
URI source = null;
try {
DataMovementProtocol dataMovementProtocol = OrchestratorUtils.getPreferredDataMovementProtocol(orchestratorContext, processModel, gatewayId);
- source = new URI(dataMovementProtocol.name(), computeResource.getHostName(),
- computeResourcePreference.getLoginUserName(), OrchestratorUtils.getDataMovementPort(orchestratorContext, processModel, gatewayId), remoteOutputDir + processOutput.getValue(), null, null);
+ source = new URI(dataMovementProtocol.name(),
+ computeResourcePreference.getLoginUserName(),
+ computeResource.getHostName(),
+ OrchestratorUtils.getDataMovementPort(orchestratorContext, processModel, gatewayId),
+ remoteOutputDir + processOutput.getValue(), null, null);
} catch (URISyntaxException e) {
throw new TaskException("Error while constructing source file URI");
}
[2/2] airavata git commit: Merge branch 'orchestratorTaskBreakdown'
of https://git-wip-us.apache.org/repos/asf/airavata into
orchestratorTaskBreakdown
Posted by sh...@apache.org.
Merge branch 'orchestratorTaskBreakdown' of https://git-wip-us.apache.org/repos/asf/airavata into orchestratorTaskBreakdown
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/85885d9c
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/85885d9c
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/85885d9c
Branch: refs/heads/orchestratorTaskBreakdown
Commit: 85885d9cbfb0c94b53d8be62bf1c8ea637291a18
Parents: d139f69 2d6ee02
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Mon Nov 2 15:32:22 2015 -0500
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Mon Nov 2 15:32:22 2015 -0500
----------------------------------------------------------------------
.../validator/impl/BatchQueueValidator.java | 193 ++++++++++---------
.../cpi/impl/SimpleOrchestratorImpl.java | 3 +
2 files changed, 100 insertions(+), 96 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/85885d9c/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java
----------------------------------------------------------------------