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 2015/09/09 21:43:11 UTC
airavata git commit: Moved temp job sumission script to process local
data directory
Repository: airavata
Updated Branches:
refs/heads/master 95cc3c4ab -> 84c1ae554
Moved temp job sumission script to process local data directory
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/84c1ae55
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/84c1ae55
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/84c1ae55
Branch: refs/heads/master
Commit: 84c1ae554b9d2de34ddff705b08b6f5a15f4580a
Parents: 95cc3c4
Author: Shameera Rathanyaka <sh...@gmail.com>
Authored: Wed Sep 9 15:43:05 2015 -0400
Committer: Shameera Rathanyaka <sh...@gmail.com>
Committed: Wed Sep 9 15:43:05 2015 -0400
----------------------------------------------------------------------
.../main/java/org/apache/airavata/gfac/core/GFacUtils.java | 9 +++++++--
.../airavata/gfac/impl/task/AdvancedSCPDataStageTask.java | 8 +-------
.../airavata/gfac/impl/task/SSHForkJobSubmissionTask.java | 4 ++--
.../airavata/gfac/impl/task/SSHJobSubmissionTask.java | 2 +-
4 files changed, 11 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/84c1ae55/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
index 55dcfbc..454af18 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
@@ -944,7 +944,7 @@ public class GFacUtils {
}
}
- public static File createJobFile(JobDescriptor jobDescriptor, JobManagerConfiguration jobManagerConfiguration) throws GFacException {
+ public static File createJobFile(TaskContext taskContext, JobDescriptor jobDescriptor, JobManagerConfiguration jobManagerConfiguration) throws GFacException {
try {
TransformerFactory factory = TransformerFactory.newInstance();
URL resource = GFacUtils.class.getClassLoader().getResource(jobManagerConfiguration.getJobDescriptionTemplateName());
@@ -971,7 +971,7 @@ public class GFacUtils {
int number = new SecureRandom().nextInt();
number = (number < 0 ? -number : number);
- tempJobFile = new File(ServerSettings.getLocalDataLocation(), Integer.toString(number) +
+ tempJobFile = new File(GFacUtils.getLocalDataDir(taskContext), Integer.toString(number) +
jobManagerConfiguration.getScriptExtension());
FileUtils.writeStringToFile(tempJobFile, scriptContent);
return tempJobFile;
@@ -984,6 +984,11 @@ public class GFacUtils {
}
}
+ public static File getLocalDataDir(TaskContext taskContext) {
+ String outputPath = ServerSettings.getLocalDataLocation();
+ outputPath = (outputPath.endsWith(File.separator) ? outputPath : outputPath + File.separator);
+ return new File(outputPath + taskContext.getParentProcessContext() .getProcessId());
+ }
public static String getExperimentNodePath(String experimentId) {
return ZKPaths.makePath(ZkConstants.ZOOKEEPER_EXPERIMENT_NODE, experimentId);
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/84c1ae55/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/AdvancedSCPDataStageTask.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/AdvancedSCPDataStageTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/AdvancedSCPDataStageTask.java
index 34a23df..32931c7 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/AdvancedSCPDataStageTask.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/AdvancedSCPDataStageTask.java
@@ -115,7 +115,7 @@ public class AdvancedSCPDataStageTask implements Task{
(taskContext.getTaskModel());
URI sourceURI = new URI(subTaskModel.getSource());
- File templocalDataDir = getLocalDataDir(taskContext);
+ File templocalDataDir = GFacUtils.getLocalDataDir(taskContext);
if (!templocalDataDir.exists()) {
if (!templocalDataDir.mkdirs()) {
// failed to create temp output location
@@ -248,12 +248,6 @@ public class AdvancedSCPDataStageTask implements Task{
}
- private File getLocalDataDir(TaskContext taskContext) {
- String outputPath = ServerSettings.getLocalDataLocation();
- outputPath = (outputPath.endsWith(File.separator) ? outputPath : outputPath + File.separator);
- return new File(outputPath + taskContext.getParentProcessContext() .getProcessId());
- }
-
@Override
public TaskStatus recover(TaskContext taskContext) {
return null;
http://git-wip-us.apache.org/repos/asf/airavata/blob/84c1ae55/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SSHForkJobSubmissionTask.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SSHForkJobSubmissionTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SSHForkJobSubmissionTask.java
index 5f9d089..95645c5 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SSHForkJobSubmissionTask.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SSHForkJobSubmissionTask.java
@@ -71,8 +71,8 @@ public class SSHForkJobSubmissionTask implements JobSubmissionTask {
jConfig = Factory.getJobManagerConfiguration(resourceJobManager);
}
JobStatus jobStatus = new JobStatus();
- File jobFile = GFacUtils.createJobFile(jobDescriptor, jConfig);
- if (jobFile != null && jobFile.exists()) {
+ File jobFile = GFacUtils.createJobFile(taskContext, jobDescriptor, jConfig);
+ if (jobFile != null && jobFile.exists()) {
jobModel.setJobDescription(FileUtils.readFileToString(jobFile));
JobSubmissionOutput jobSubmissionOutput = remoteCluster.submitBatchJob(jobFile.getPath(),
processContext.getWorkingDir());
http://git-wip-us.apache.org/repos/asf/airavata/blob/84c1ae55/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SSHJobSubmissionTask.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SSHJobSubmissionTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SSHJobSubmissionTask.java
index 84f2b86..1cd068f 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SSHJobSubmissionTask.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SSHJobSubmissionTask.java
@@ -71,7 +71,7 @@ public class SSHJobSubmissionTask implements JobSubmissionTask {
jConfig = Factory.getJobManagerConfiguration(resourceJobManager);
}
JobStatus jobStatus = new JobStatus();
- File jobFile = GFacUtils.createJobFile(jobDescriptor, jConfig);
+ File jobFile = GFacUtils.createJobFile(taskContext, jobDescriptor, jConfig);
if (jobFile != null && jobFile.exists()) {
jobModel.setJobDescription(FileUtils.readFileToString(jobFile));
JobSubmissionOutput jobSubmissionOutput = remoteCluster.submitBatchJob(jobFile.getPath(),