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 2016/11/11 21:11:09 UTC
airavata git commit: keep session with login username + protocol +
computer resource Id as key
Repository: airavata
Updated Branches:
refs/heads/develop c456337f2 -> 4139ae997
keep session with login username + protocol + computer resource Id as key
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/4139ae99
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/4139ae99
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/4139ae99
Branch: refs/heads/develop
Commit: 4139ae997854f38b17b6872395705be841d6a3e9
Parents: c456337
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Fri Nov 11 16:11:03 2016 -0500
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Fri Nov 11 16:11:03 2016 -0500
----------------------------------------------------------------------
.../main/java/org/apache/airavata/gfac/impl/Factory.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/4139ae99/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/Factory.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/Factory.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/Factory.java
index 21327fd..22986f2 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/Factory.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/Factory.java
@@ -284,8 +284,13 @@ public abstract class Factory {
String computeResourceId = processContext.getComputeResourceId();
DataMovementProtocol dataMovementProtocol = processContext.getDataMovementProtocol();
- String key = dataMovementProtocol.name() + ":" + computeResourceId;
- RemoteCluster remoteCluster = remoteClusterMap.get(key);
+ String key = new StringBuilder(processContext.getLoginUserName())
+ .append(':')
+ .append(dataMovementProtocol.name())
+ .append(':')
+ .append(computeResourceId).toString();
+
+ RemoteCluster remoteCluster = remoteClusterMap.get(key);
if (remoteCluster == null) {
JobManagerConfiguration jobManagerConfiguration = getJobManagerConfiguration(processContext.getResourceJobManager());
if (dataMovementProtocol == DataMovementProtocol.LOCAL) {