You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2015/02/14 15:11:48 UTC

svn commit: r1659796 - /uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java

Author: degenaro
Date: Sat Feb 14 14:11:48 2015
New Revision: 1659796

URL: http://svn.apache.org/r1659796
Log:
UIMA-4236 DUCC Job Driver (JD) should support configurable startup initialization error limit

Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java?rev=1659796&r1=1659795&r2=1659796&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java Sat Feb 14 14:11:48 2015
@@ -38,6 +38,7 @@ import org.apache.uima.ducc.common.utils
 import org.apache.uima.ducc.common.utils.DuccPropertiesResolver;
 import org.apache.uima.ducc.common.utils.DuccSchedulerClasses;
 import org.apache.uima.ducc.common.utils.TimeStamp;
+import org.apache.uima.ducc.common.utils.VersionCommunicationsJdJp;
 import org.apache.uima.ducc.common.utils.id.DuccId;
 import org.apache.uima.ducc.orchestrator.user.UserLogging;
 import org.apache.uima.ducc.orchestrator.utilities.TrackSync;
@@ -612,6 +613,10 @@ public class StateManager {
 				if(jdStatusReport.getWorkItemsTotal() == 0) {
 					jobTerminate(duccWorkJob, JobCompletionType.NoWorkItemsFound, new Rationale("job driver had no work items to process"), ProcessDeallocationType.JobCanceled);
 				}
+				else if(jdStatusReport.isKillJob()) {
+					rationale = jdStatusReport.getJobCompletionRationale();
+					jobTerminate(duccWorkJob, JobCompletionType.CanceledByDriver, rationale, ProcessDeallocationType.JobFailure);
+				}
 				else {
 					switch(jdStatusReport.getDriverState()) {
 					case Failed:
@@ -1559,7 +1564,9 @@ public class StateManager {
 								// <UIMA-3923>
 								advanceToCompleted(job);
 								// </UIMA-3923>
-								checkInitializationState(job);
+								if(VersionCommunicationsJdJp.get() == 1) {
+									checkInitializationState(job);
+								}
 								break;
 							case Service:
 								DuccWorkJob service = (DuccWorkJob) duccWork;