You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2014/07/12 22:36:19 UTC
[1/2] git commit: more logs for monitoring and launching out handlers
after more unknown states
Repository: airavata
Updated Branches:
refs/heads/master 80d1b2edf -> d89835bc7
more logs for monitoring and launching out handlers after more unknown states
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/fdb54d02
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/fdb54d02
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/fdb54d02
Branch: refs/heads/master
Commit: fdb54d0202315df044096f2234fb31869ab8e0d8
Parents: feb1d32
Author: lahiru <la...@apache.org>
Authored: Sat Jul 12 16:30:28 2014 -0400
Committer: lahiru <la...@apache.org>
Committed: Sat Jul 12 16:30:28 2014 -0400
----------------------------------------------------------------------
.../org/apache/airavata/gfac/core/monitor/MonitorID.java | 4 ++--
.../gfac/monitor/impl/pull/qstat/HPCPullMonitor.java | 10 ++++++++++
2 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/fdb54d02/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/MonitorID.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/MonitorID.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/MonitorID.java
index a68c142..a6477ba 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/MonitorID.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/MonitorID.java
@@ -189,7 +189,7 @@ public class MonitorID {
break;
default:
int loginfo = getFailedCount()+1;
- logger.info("Increasing the failed count to:"+loginfo);
+ logger.info("JobId:" + this.getJobID()+" Increasing the failed count to:"+loginfo+"");
setFailedCount(getFailedCount() + 1);
try {
// when state becomes unknown we sleep for a while
@@ -207,7 +207,7 @@ public class MonitorID {
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
}
int loginfo = getFailedCount()+1;
- logger.info("Increasing the failed count to:"+loginfo);
+ logger.info("JobId:" + this.getJobID()+" Increasing the failed count to:"+loginfo+"");
setFailedCount(getFailedCount() + 1);
}
} else {
http://git-wip-us.apache.org/repos/asf/airavata/blob/fdb54d02/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 1238bf6..599446a 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
@@ -186,6 +186,16 @@ public class HPCPullMonitor extends PullMonitor {
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()));
completedJobs.add(iMonitorID);
+ try {
+ logger.error("Launching outflow handlers to check output are genereated or not");
+ gfac.invokeOutFlowHandlers(iMonitorID.getJobExecutionContext());
+ } catch (GFacException e) {
+ publisher.publish(new TaskStatusChangeRequest(new TaskIdentity(iMonitorID.getExperimentID(), iMonitorID.getWorkflowNodeID(),
+ iMonitorID.getTaskID()), TaskState.FAILED));
+ publisher.publish(new ExperimentStatusChangeRequest(new ExperimentIdentity(iMonitorID.getExperimentID()),
+ ExperimentState.FAILED));
+ logger.info(e.getLocalizedMessage(), e);
+ }
} else {
// Evey
iMonitorID.setLastMonitored(new Timestamp((new Date()).getTime()));
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
Posted by la...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d89835bc
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d89835bc
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d89835bc
Branch: refs/heads/master
Commit: d89835bc7dcafc0ae11c08c00578bc848d2d764f
Parents: fdb54d0 80d1b2e
Author: lahiru <la...@apache.org>
Authored: Sat Jul 12 16:35:23 2014 -0400
Committer: lahiru <la...@apache.org>
Committed: Sat Jul 12 16:35:23 2014 -0400
----------------------------------------------------------------------
.../airavata/api/server/handler/AiravataServerHandler.java | 6 +++---
.../persistance/registry/jpa/impl/ProjectRegistry.java | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------