You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2014/11/13 20:36:36 UTC
airavata git commit: fixing local job submission
Repository: airavata
Updated Branches:
refs/heads/master a40f49c90 -> 30798f8a9
fixing local job submission
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/30798f8a
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/30798f8a
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/30798f8a
Branch: refs/heads/master
Commit: 30798f8a91ee667347da3a2892a4fa28fd1fcc0f
Parents: a40f49c
Author: Chathuri Wimalasena <ka...@gmail.com>
Authored: Thu Nov 13 14:36:14 2014 -0500
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Thu Nov 13 14:36:14 2014 -0500
----------------------------------------------------------------------
.../java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java | 2 ++
.../airavata/gfac/core/handler/AppDescriptorCheckHandler.java | 3 +--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/30798f8a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
index 932384b..ef2805a 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
@@ -370,6 +370,8 @@ public class BetterGfacImpl implements GFac,Watcher {
}
}
}
+ } else {
+ setUpWorkingLocation(jobExecutionContext, applicationInterface, "/tmp");
}
return jobExecutionContext;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/30798f8a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/AppDescriptorCheckHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/AppDescriptorCheckHandler.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/AppDescriptorCheckHandler.java
index 72a8f1f..34ea139 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/AppDescriptorCheckHandler.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/AppDescriptorCheckHandler.java
@@ -40,9 +40,8 @@ public class AppDescriptorCheckHandler implements GFacRecoverableHandler {
logger.info("Error saving plugin status to ZK");
}
StringBuffer data = new StringBuffer();
- ComputeResourcePreference computeResourcePreference = jobExecutionContext.getApplicationContext().getComputeResourcePreference();
- data.append(computeResourcePreference.getScratchLocation());
+ data.append(jobExecutionContext.getScratchLocation());
data.append(",").append(jobExecutionContext.getWorkingDir());
/*