Repository: airavata Updated Branches: refs/heads/airavata-0.15-release-branch 97135ad33 -> 57de8d6b9
Incase of absence jobId at submit step , try 3 times maximum to get job Id by verification commands. Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/57de8d6b Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/57de8d6b Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/57de8d6b Branch: refs/heads/airavata-0.15-release-branch Commit: 57de8d6b9dc0ed3b59f0fcec076792989c634c9a Parents: 97135ad Author: Shameera Rathanyaka <[email protected]> Authored: Fri Jun 5 16:22:32 2015 -0400 Committer: Shameera Rathanyaka <[email protected]> Committed: Fri Jun 5 16:22:32 2015 -0400 ---------------------------------------------------------------------- .../gfac/ssh/provider/impl/SSHProvider.java | 21 ++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/57de8d6b/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 a492a6f..a9eaae2 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 @@ -177,14 +177,19 @@ public class SSHProvider extends AbstractProvider { } } else { jobExecutionContext.setJobDetails(jobDetails); - String verifyJobId = verifyJobSubmission(cluster, jobDetails); - if (verifyJobId != null && !verifyJobId.isEmpty()) { - // JobStatus either changed from SUBMITTED to QUEUED or directly to QUEUED - jobID = verifyJobId; - jobDetails.setJobID(jobID); - monitorPublisher.publish(new GfacExperimentStateChangeRequest(new MonitorID(jobExecutionContext) - , GfacExperimentState.JOBSUBMITTED)); - GFacUtils.saveJobStatus(jobExecutionContext, jobDetails, JobState.QUEUED, monitorPublisher); + int verificationTryCount = 0; + while (verificationTryCount++ < 3) { + String verifyJobId = verifyJobSubmission(cluster, jobDetails); + if (verifyJobId != null && !verifyJobId.isEmpty()) { + // JobStatus either changed from SUBMITTED to QUEUED or directly to QUEUED + jobID = verifyJobId; + jobDetails.setJobID(jobID); + monitorPublisher.publish(new GfacExperimentStateChangeRequest(new MonitorID(jobExecutionContext) + , GfacExperimentState.JOBSUBMITTED)); + GFacUtils.saveJobStatus(jobExecutionContext, jobDetails, JobState.QUEUED, monitorPublisher); + break; + } + Thread.sleep(verificationTryCount*1000); } }
