Repository: airavata Updated Branches: refs/heads/master 87f6fbd8c -> 41a2c860e
Fixed AIRAVATA-1299. Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/1a730589 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/1a730589 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/1a730589 Branch: refs/heads/master Commit: 1a7305895232983da3c81cde785c1628e8504a68 Parents: 2bcadf5 Author: raminder <[email protected]> Authored: Fri Jun 20 11:23:53 2014 -0400 Committer: raminder <[email protected]> Committed: Fri Jun 20 11:23:53 2014 -0400 ---------------------------------------------------------------------- .../gfac/monitor/impl/pull/qstat/HPCPullMonitor.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/1a730589/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 38b631c..03f1940 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 @@ -21,8 +21,10 @@ package org.apache.airavata.gfac.monitor.impl.pull.qstat; import com.google.common.eventbus.EventBus; + import org.apache.airavata.common.utils.ServerSettings; import org.apache.airavata.commons.gfac.type.HostDescription; +import org.apache.airavata.gfac.GFacException; import org.apache.airavata.gfac.core.monitor.MonitorID; import org.apache.airavata.gfac.core.monitor.state.JobStatusChangeRequest; import org.apache.airavata.gfac.core.notification.MonitorPublisher; @@ -34,6 +36,7 @@ import org.apache.airavata.gfac.monitor.util.CommonUtils; import org.apache.airavata.gsi.ssh.api.SSHApiException; import org.apache.airavata.model.workspace.experiment.JobState; import org.apache.airavata.schemas.gfac.GsisshHostType; +import org.apache.openjpa.lib.log.Log; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -156,7 +159,11 @@ public class HPCPullMonitor extends PullMonitor { // After successful monitoring perform following actions to cleanup the queue, if necessary if (jobStatus.getState().equals(JobState.COMPLETE)) { completedJobs.add(iMonitorID); - CommonUtils.invokeOutFlowHandlers(iMonitorID.getJobExecutionContext()); + try { + CommonUtils.invokeOutFlowHandlers(iMonitorID.getJobExecutionContext()); + } catch (GFacException e) { + logger.info(e.getLocalizedMessage(),e); + } } else if (iMonitorID.getFailedCount() > 2 && iMonitorID.getStatus().equals(JobState.UNKNOWN)) { logger.error("Tried to monitor the job with ID " + iMonitorID.getJobID() + " But failed 3 times, so skip this Job from Monitor"); iMonitorID.setLastMonitored(new Timestamp((new Date()).getTime()));
