Repository: airavata Updated Branches: refs/heads/master 8b8451f3d -> 0f7a1940e
Modifying more monitoring - AIRAVATA-1057 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/0f7a1940 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/0f7a1940 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/0f7a1940 Branch: refs/heads/master Commit: 0f7a1940ebbd37269224d013dad3bf613853be28 Parents: 8b8451f Author: lahiru <[email protected]> Authored: Fri Mar 7 11:52:29 2014 -0500 Committer: lahiru <[email protected]> Committed: Fri Mar 7 11:52:29 2014 -0500 ---------------------------------------------------------------------- .../job/monitor/AiravataJobStatusUpdator.java | 3 +++ .../apache/airavata/gsi/ssh/impl/JobStatus.java | 24 +++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/0f7a1940/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/AiravataJobStatusUpdator.java ---------------------------------------------------------------------- diff --git a/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/AiravataJobStatusUpdator.java b/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/AiravataJobStatusUpdator.java index 8b458a5..7407a10 100644 --- a/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/AiravataJobStatusUpdator.java +++ b/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/AiravataJobStatusUpdator.java @@ -95,15 +95,18 @@ public class AiravataJobStatusUpdator{ break; case CANCELED: logger.info("Job ID:" + jobStatus.getMonitorID().getJobID() + " is CANCELED"); + jobsToMonitor.remove(jobStatus.getMonitorID()); break; case FAILED: logger.info("Job ID:" + jobStatus.getMonitorID().getJobID() + " is FAILED"); + jobsToMonitor.remove(jobStatus.getMonitorID()); break; case HELD: logger.info("Job ID:" + jobStatus.getMonitorID().getJobID() + " is HELD"); break; case SUSPENDED: logger.info("Job ID:" + jobStatus.getMonitorID().getJobID() + " is SUSPENDED"); + jobsToMonitor.remove(jobStatus.getMonitorID()); break; } } http://git-wip-us.apache.org/repos/asf/airavata/blob/0f7a1940/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/JobStatus.java ---------------------------------------------------------------------- diff --git a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/JobStatus.java b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/JobStatus.java index 56bb6e7..ba8b58b 100644 --- a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/JobStatus.java +++ b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/JobStatus.java @@ -33,7 +33,7 @@ * S - (Unicos only) job is suspend. */ public enum JobStatus { - C, E, H, Q, R, T, W, S,U; + C, E, H, Q, R, T, W, S,U,F,CA,CD,CF,CG,NF,PD,PR,TO; public static JobStatus fromString(String status){ if(status != null){ @@ -53,6 +53,28 @@ return JobStatus.W; }else if("S".equals(status)){ return JobStatus.S; + }else if("F".equals(status)){ + return JobStatus.F; + }else if("S".equals(status)){ + return JobStatus.S; + }else if("CA".equals(status)){ + return JobStatus.CA; + }else if("CF".equals(status)){ + return JobStatus.CF; + }else if("CD".equals(status)){ + return JobStatus.CD; + }else if("CG".equals(status)){ + return JobStatus.CG; + }else if("NF".equals(status)){ + return JobStatus.NF; + }else if("PD".equals(status)){ + return JobStatus.PD; + }else if("PR".equals(status)){ + return JobStatus.PR; + }else if("TO".equals(status)){ + return JobStatus.TO; + }else if("U".equals(status)){ + return JobStatus.U; } } return JobStatus.U;
