You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sh...@apache.org on 2015/04/15 22:49:01 UTC
[25/28] airavata git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
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/2dde0d3a
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/2dde0d3a
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/2dde0d3a
Branch: refs/heads/emailMonitoring
Commit: 2dde0d3aa69bd48168dac624e358cab966311e5c
Parents: 90aa639 ae15740
Author: shamrath <sh...@gmail.com>
Authored: Wed Apr 15 11:39:56 2015 -0400
Committer: shamrath <sh...@gmail.com>
Committed: Wed Apr 15 11:39:56 2015 -0400
----------------------------------------------------------------------
.../lib/airavata/messagingEvents_types.cpp | 36 +++-
.../lib/airavata/messagingEvents_types.h | 20 +-
.../Airavata/Model/Messaging/Event/Types.php | 40 ++++
.../airavata/model/messaging/event/ttypes.py | 30 ++-
.../messaging/event/TaskTerminateEvent.java | 196 ++++++++++++++++++-
.../messagingEvents.thrift | 2 +
.../apache/airavata/gfac/cpi/GfacService.java | 125 ++++++++++--
.../apache/airavata/gfac/server/GfacServer.java | 2 +
.../airavata/gfac/server/GfacServerHandler.java | 11 +-
.../airavata/gfac/core/cpi/BetterGfacImpl.java | 45 +++--
.../gfac/core/utils/GFacThreadPoolExecutor.java | 3 +-
.../gfac/monitor/email/EmailBasedMonitor.java | 8 +-
.../monitor/impl/pull/qstat/HPCPullMonitor.java | 8 +-
.../core/impl/RabbitMQTaskLaunchConsumer.java | 2 +-
.../core/impl/RabbitMQTaskLaunchPublisher.java | 11 +-
.../core/impl/GFACPassiveJobSubmitter.java | 6 +-
16 files changed, 481 insertions(+), 64 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/2dde0d3a/modules/gfac/gfac-monitor/gfac-email-monitor/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java
----------------------------------------------------------------------
diff --cc modules/gfac/gfac-monitor/gfac-email-monitor/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java
index e45de1d,95c98b8..36bd0eb
--- a/modules/gfac/gfac-monitor/gfac-email-monitor/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java
+++ b/modules/gfac/gfac-monitor/gfac-email-monitor/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java
@@@ -207,16 -207,18 +207,20 @@@ public class EmailBasedMonitor implemen
JobState resultState = jobStatusResult.getState();
jEC.getJobDetails().setJobStatus(new JobStatus(resultState));
if (resultState == JobState.COMPLETE) {
- GFacThreadPoolExecutor.getFixedThreadPool().submit(new OutHandlerWorker(jEC, BetterGfacImpl.getMonitorPublisher()));
+ try {
+ GFacThreadPoolExecutor.getFixedThreadPool().submit(new OutHandlerWorker(jEC, BetterGfacImpl.getMonitorPublisher()));
+ } catch (ApplicationSettingsException e) {
+ log.error(e.getMessage(), e);
+ }
}else if (resultState == JobState.QUEUED) {
- // TODO - publish queued rabbitmq message
+ // nothing special thing to do, update the status change to rabbit mq at the end of this method.
}else if (resultState == JobState.FAILED) {
- // TODO - handle failed scenario
jobMonitorMap.remove(jobStatusResult.getJobId());
log.info("Job failed email received , removed job from job monitoring");
-// monitorPublisher.publish(jEC.getJobDetails().getJobStatus());
+ }else if (resultState == JobState.CANCELED) {
+ jobMonitorMap.remove(jobStatusResult.getJobId());
+ log.info("Job canceled mail received, removed job from job monitoring");
+
}
publishJobStatusChange(jEC);
}