airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shame...@apache.org
Subject [3/3] airavata git commit: Return correct Remote cluster for LOCAL_FORK jobsubmission
Date Mon, 09 Nov 2015 22:21:25 GMT
Return correct Remote cluster for LOCAL_FORK jobsubmission


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b00b8b23
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b00b8b23
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b00b8b23

Branch: refs/heads/master
Commit: b00b8b23f683a59d30b7307ff4f88c2d9646b280
Parents: 2df93cc
Author: Shameera Rathnayaka <shameerainfo@gmail.com>
Authored: Mon Nov 9 17:21:12 2015 -0500
Committer: Shameera Rathnayaka <shameerainfo@gmail.com>
Committed: Mon Nov 9 17:21:12 2015 -0500

----------------------------------------------------------------------
 .../src/main/java/org/apache/airavata/gfac/impl/Factory.java      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/b00b8b23/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 4dc63e6..ff4ca9d 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
@@ -210,7 +210,8 @@ public abstract class Factory {
 		JobSubmissionProtocol jobSubmissionProtocol = processContext.getJobSubmissionProtocol();
         if (remoteCluster == null) {
             JobManagerConfiguration jobManagerConfiguration = getJobManagerConfiguration(processContext.getResourceJobManager());
-            if (jobSubmissionProtocol == JobSubmissionProtocol.LOCAL) {
+            if (jobSubmissionProtocol == JobSubmissionProtocol.LOCAL ||
+                    jobSubmissionProtocol == JobSubmissionProtocol.LOCAL_FORK) {
                 remoteCluster = new LocalRemoteCluster(processContext.getServerInfo(), jobManagerConfiguration,
null);
             } else if (jobSubmissionProtocol == JobSubmissionProtocol.SSH ||
                     jobSubmissionProtocol == JobSubmissionProtocol.SSH_FORK) {


Mime
View raw message