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/05/12 17:45:47 UTC
[1/2] airavata git commit: Fixed JobDetails saving issue.
Repository: airavata
Updated Branches:
refs/heads/master cdf979905 -> 9a8a14b9f
Fixed JobDetails saving issue.
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d2afa76f
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d2afa76f
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d2afa76f
Branch: refs/heads/master
Commit: d2afa76fb0eedce88c9eff7d3c107aa114cfd0e6
Parents: badaa73
Author: shamrath <sh...@gmail.com>
Authored: Tue May 12 11:38:15 2015 -0400
Committer: shamrath <sh...@gmail.com>
Committed: Tue May 12 11:38:15 2015 -0400
----------------------------------------------------------------------
.../org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/d2afa76f/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java
index 2a3287b..31ec261 100644
--- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java
+++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java
@@ -169,23 +169,24 @@ public class SSHProvider extends AbstractProvider {
String jobID = cluster.submitBatchJob(jobDescriptor);
if (jobID != null) {
+ jobDetails.setJobID(jobID);
GFacUtils.saveJobStatus(jobExecutionContext, jobDetails, JobState.SUBMITTED);
}
jobExecutionContext.setJobDetails(jobDetails);
String verifyJobId = verifyJobSubmission(cluster, jobDetails);
if (verifyJobId != null) {
// JobStatus either changed from SUBMITTED to QUEUED or directly to QUEUED
- GFacUtils.saveJobStatus(jobExecutionContext, jobDetails, JobState.QUEUED);
if (jobID == null) {
jobID = verifyJobId;
+ jobDetails.setJobID(jobID);
}
+ GFacUtils.saveJobStatus(jobExecutionContext, jobDetails, JobState.QUEUED);
}
if (jobID == null) {
log.error("Couldn't find remote jobId for JobName:" + jobDetails.getJobName() + ", ExperimentId:" + jobExecutionContext.getExperimentID());
GFacUtils.updateExperimentStatus(jobExecutionContext.getExperimentID(), ExperimentState.FAILED);
return;
}
- jobDetails.setJobID(jobID);
data.append("jobDesc=").append(jobDescriptor.toXML());
data.append(",jobId=").append(jobDetails.getJobID());
delegateToMonitorHandlers(jobExecutionContext);
[2/2] airavata git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
Posted by sh...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
# Conflicts:
# modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/9a8a14b9
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/9a8a14b9
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/9a8a14b9
Branch: refs/heads/master
Commit: 9a8a14b9f8ec5a1e7e447b71bc4aebec9c8dba47
Parents: d2afa76 cdf9799
Author: shamrath <sh...@gmail.com>
Authored: Tue May 12 11:45:40 2015 -0400
Committer: shamrath <sh...@gmail.com>
Committed: Tue May 12 11:45:40 2015 -0400
----------------------------------------------------------------------
.../org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/9a8a14b9/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java
----------------------------------------------------------------------
diff --cc modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java
index 31ec261,cced757..676e045
--- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java
+++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java
@@@ -161,32 -161,29 +161,29 @@@ public class SSHProvider extends Abstra
}
// This installed path is a mandetory field, because this could change based on the computing resource
JobDescriptor jobDescriptor = GFACSSHUtils.createJobDescriptor(jobExecutionContext, cluster);
--
jobDetails.setJobName(jobDescriptor.getJobName());
log.info(jobDescriptor.toXML());
--
jobDetails.setJobDescription(jobDescriptor.toXML());
- jobExecutionContext.setJobDetails(jobDetails);
--
String jobID = cluster.submitBatchJob(jobDescriptor);
if (jobID != null) {
+ jobDetails.setJobID(jobID);
GFacUtils.saveJobStatus(jobExecutionContext, jobDetails, JobState.SUBMITTED);
- } else {
- String verifyJobId = verifyJobSubmission(cluster, jobDetails);
- if (verifyJobId != null) {
- // JobStatus either changed from SUBMITTED to QUEUED or directly to QUEUED
- GFacUtils.saveJobStatus(jobExecutionContext, jobDetails, JobState.QUEUED);
+ }
+ jobExecutionContext.setJobDetails(jobDetails);
+ String verifyJobId = verifyJobSubmission(cluster, jobDetails);
+ if (verifyJobId != null) {
+ // JobStatus either changed from SUBMITTED to QUEUED or directly to QUEUED
+ if (jobID == null) {
jobID = verifyJobId;
- } else {
- log.error("Couldn't find remote jobId for JobName:" + jobDetails.getJobName() + ", ExperimentId:" + jobExecutionContext.getExperimentID());
- GFacUtils.updateExperimentStatus(jobExecutionContext.getExperimentID(), ExperimentState.FAILED);
- return;
+ jobDetails.setJobID(jobID);
}
+ GFacUtils.saveJobStatus(jobExecutionContext, jobDetails, JobState.QUEUED);
+ }
+ if (jobID == null) {
+ log.error("Couldn't find remote jobId for JobName:" + jobDetails.getJobName() + ", ExperimentId:" + jobExecutionContext.getExperimentID());
+ GFacUtils.updateExperimentStatus(jobExecutionContext.getExperimentID(), ExperimentState.FAILED);
+ return;
}
- jobDetails.setJobID(jobID);
data.append("jobDesc=").append(jobDescriptor.toXML());
data.append(",jobId=").append(jobDetails.getJobID());
delegateToMonitorHandlers(jobExecutionContext);