You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by di...@apache.org on 2020/03/13 01:12:34 UTC

[airavata] branch mft-integration updated: Moving login username to resource level

This is an automated email from the ASF dual-hosted git repository.

dimuthuupe pushed a commit to branch mft-integration
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/mft-integration by this push:
     new ed5cb85  Moving login username to resource level
ed5cb85 is described below

commit ed5cb8534c81721b7956e49889f2b35439e11fd5
Author: Dimuthu Wannipurage <di...@gmail.com>
AuthorDate: Thu Mar 12 21:12:19 2020 -0400

    Moving login username to resource level
---
 .../helix/impl/task/staging/DataStagingTask.java         | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/staging/DataStagingTask.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/staging/DataStagingTask.java
index d0daf4d..e95fdb3 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/staging/DataStagingTask.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/staging/DataStagingTask.java
@@ -322,11 +322,11 @@ public abstract class DataStagingTask extends AiravataTask {
                                                                                             TaskOnFailException {
 
         destPath = destPath + new File(sourcePath).getName();
-        String sourceId = "STORAGE:" + sourcePath + ":" + getGatewayId() + ":" + getTaskContext().getStorageResourceId();
-        String sourceToken = getTaskContext().getStorageResourceCredentialToken() + ":" + getTaskContext().getStorageResourceLoginUserName() + ":" + getGatewayId();
+        String sourceId = "STORAGE:" + sourcePath + ":" + getGatewayId() + ":" + getTaskContext().getStorageResourceId() + ":" + getTaskContext().getStorageResourceLoginUserName();
+        String sourceToken = getTaskContext().getStorageResourceCredentialToken() + ":" + getGatewayId();
 
-        String destId = "CLUSTER:" + destPath + ":" + getGatewayId() + ":" + getTaskContext().getComputeResourceId();
-        String destToken = getTaskContext().getComputeResourceCredentialToken() + ":" + getTaskContext().getComputeResourceLoginUserName() + ":" + getGatewayId();
+        String destId = "CLUSTER:" + destPath + ":" + getGatewayId() + ":" + getTaskContext().getComputeResourceId() + ":" + getTaskContext().getComputeResourceLoginUserName();
+        String destToken = getTaskContext().getComputeResourceCredentialToken() + ":" + getGatewayId();
 
         return transferThroughMFT(sourceId, sourceToken, destId, destToken);
     }
@@ -334,11 +334,11 @@ public abstract class DataStagingTask extends AiravataTask {
     protected boolean transferFileToStorageThroughMFT(String sourcePath, String destPath) throws TaskOnFailException,
                                                                                             ApplicationSettingsException {
 
-        String sourceId = "CLUSTER:" + sourcePath + ":" + getGatewayId() + ":" + getTaskContext().getComputeResourceId();
-        String sourceToken = getTaskContext().getComputeResourceCredentialToken() + ":" + getTaskContext().getComputeResourceLoginUserName() + ":" + getGatewayId();
+        String sourceId = "CLUSTER:" + sourcePath + ":" + getGatewayId() + ":" + getTaskContext().getComputeResourceId() + ":" + getTaskContext().getComputeResourceLoginUserName();
+        String sourceToken = getTaskContext().getComputeResourceCredentialToken() + ":" + getGatewayId();
 
-        String destId = "STORAGE:" + destPath + ":" + getGatewayId() + ":" + getTaskContext().getStorageResourceId();
-        String destToken = getTaskContext().getStorageResourceCredentialToken() + ":" + getTaskContext().getStorageResourceLoginUserName() + ":" + getGatewayId();
+        String destId = "STORAGE:" + destPath + ":" + getGatewayId() + ":" + getTaskContext().getStorageResourceId() + ":" + getTaskContext().getStorageResourceLoginUserName();
+        String destToken = getTaskContext().getStorageResourceCredentialToken() + ":" + getGatewayId();
 
         return transferThroughMFT(sourceId, sourceToken, destId, destToken);
     }