Repository: airavata Updated Branches: refs/heads/master af6b9d513 -> c6825295d
resetting the failed count when the job is not yet finished Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c6825295 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c6825295 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c6825295 Branch: refs/heads/master Commit: c6825295db58a7011458e26d70798eed5fdff9e0 Parents: af6b9d5 Author: lahiru <[email protected]> Authored: Thu Oct 2 14:43:01 2014 -0400 Committer: lahiru <[email protected]> Committed: Thu Oct 2 14:43:01 2014 -0400 ---------------------------------------------------------------------- .../airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/c6825295/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java b/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java index 855a8d2..a98c9c7 100644 --- a/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java +++ b/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java @@ -246,11 +246,13 @@ public class HPCPullMonitor extends PullMonitor { JobDescriptor jobDescriptor = JobDescriptor.fromXML(iMonitorID.getJobExecutionContext().getJobDetails().getJobDescription()); List<String> stdOut = connection.getCluster().listDirectory(jobDescriptor.getOutputDirectory()); if (stdOut.size() > 0) { - if(stdOut.contains(jobDescriptor.getStandardErrorFile())&&stdOut.contains(jobDescriptor.getStandardOutFile())) { + if (stdOut.contains(jobDescriptor.getStandardErrorFile()) && stdOut.contains(jobDescriptor.getStandardOutFile())) { completedJobs.put(iMonitorID.getJobName(), iMonitorID); + } else { + iMonitorID.setFailedCount(0); } } - } else { + } else { // Evey iMonitorID.setLastMonitored(new Timestamp((new Date()).getTime())); // if the job is complete we remove it from the Map, if any of these maps
