Repository: airavata Updated Branches: refs/heads/develop 5c6b70b61 -> 7e141b098
Fixed input staging issue Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/7e141b09 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7e141b09 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7e141b09 Branch: refs/heads/develop Commit: 7e141b09867d96a3e60b8924de54a701589440f0 Parents: 5c6b70b Author: Shameera Rathnayaka <[email protected]> Authored: Fri Dec 23 17:24:13 2016 -0500 Committer: Shameera Rathnayaka <[email protected]> Committed: Fri Dec 23 17:24:24 2016 -0500 ---------------------------------------------------------------------- .../java/org/apache/airavata/gfac/impl/HPCRemoteCluster.java | 4 ++-- .../org/apache/airavata/gfac/impl/task/SCPDataStageTask.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/7e141b09/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/HPCRemoteCluster.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/HPCRemoteCluster.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/HPCRemoteCluster.java index 875b229..89acfbc 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/HPCRemoteCluster.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/HPCRemoteCluster.java @@ -174,9 +174,9 @@ public class HPCRemoteCluster extends AbstractRemoteCluster{ log.info("Transferring from:" + sourceFile + " To: " + destinationFile); try { if (direction == DIRECTION.TO) { - SSHUtils.scpThirdParty(sourceFile, clientSession, destinationFile, session, ignoreEmptyFile); - } else { SSHUtils.scpThirdParty(sourceFile, session, destinationFile, clientSession, ignoreEmptyFile); + } else { + SSHUtils.scpThirdParty(sourceFile, clientSession, destinationFile, session, ignoreEmptyFile); } break; // exit while loop } catch (JSchException e) { http://git-wip-us.apache.org/repos/asf/airavata/blob/7e141b09/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java index 87bcbc1..a578fb0 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java @@ -155,7 +155,7 @@ public class SCPDataStageTask implements Task { authenticationInfo = Factory.getStorageSSHKeyAuthentication(processContext); status = new TaskStatus(TaskState.COMPLETED); - ServerInfo serverInfo = processContext.getStorageResourceServerInfo(); + ServerInfo serverInfo = processContext.getComputeResourceServerInfo(); Session sshSession = Factory.getSSHSession(authenticationInfo, serverInfo); if (processState == ProcessState.INPUT_DATA_STAGING) { inputDataStaging(taskContext, sshSession, sourceURI, destinationURI);
