airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shame...@apache.org
Subject airavata git commit: trigger output flow on cancel , it will move to process to cancel
Date Wed, 23 Sep 2015 16:31:10 GMT
Repository: airavata
Updated Branches:
  refs/heads/master 7d000276f -> dbb1a0fd2


trigger output flow on cancel ,it will move to process to cancel


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/dbb1a0fd
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/dbb1a0fd
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/dbb1a0fd

Branch: refs/heads/master
Commit: dbb1a0fd2f7570351e0b8df90a9244404c22093a
Parents: 7d00027
Author: Shameera Rathanyaka <shameerainfo@gmail.com>
Authored: Wed Sep 23 12:31:04 2015 -0400
Committer: Shameera Rathanyaka <shameerainfo@gmail.com>
Committed: Wed Sep 23 12:31:04 2015 -0400

----------------------------------------------------------------------
 .../apache/airavata/gfac/monitor/email/EmailBasedMonitor.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/dbb1a0fd/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java
b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java
index facba34..622c6c5 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java
@@ -317,10 +317,10 @@ public class EmailBasedMonitor implements JobMonitor, Runnable{
             log.info("[EJM]: Job failed email received , removed job from job monitoring.
" + jobDetails);
         }else if (resultState == JobState.CANCELED) {
             jobMonitorMap.remove(jobStatusResult.getJobId());
-            runOutflowTasks = false; // Do we need to run out handlers in canceled case?
 	        jobStatus.setJobState(JobState.CANCELED);
 	        jobStatus.setReason("Canceled email received");
-            log.info("[EJM]: Job canceled mail received, removed job from job monitoring.
" + jobDetails);
+	        log.info("[EJM]: Job canceled mail received, removed job from job monitoring. "
+ jobDetails);
+	        runOutflowTasks = true; // we run out flow and this will move process to cancel
state.
         }
 	    if (jobStatus.getJobState() != null) {
 		    try {


Mime
View raw message