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 2013/08/09 12:15:05 UTC

svn commit: r1512233 - in /uima/sandbox/uima-ducc/trunk: uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/

Author: degenaro
Date: Fri Aug  9 10:15:04 2013
New Revision: 1512233

URL: http://svn.apache.org/r1512233
Log:
UIMA-3148 Confusing ducc-mon states.

Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/JobFactory.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccCompletionType.java

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/JobFactory.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/JobFactory.java?rev=1512233&r1=1512232&r2=1512233&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/JobFactory.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/JobFactory.java Fri Aug  9 10:15:04 2013
@@ -24,7 +24,6 @@ import java.util.Enumeration;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.tools.ant.taskdefs.ExecTask;
 import org.apache.uima.ducc.cli.DuccUiUtilities;
 import org.apache.uima.ducc.common.NodeIdentity;
 import org.apache.uima.ducc.common.config.CommonConfiguration;

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=1512233&r1=1512232&r2=1512233&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 Fri Aug  9 10:15:04 2013
@@ -1347,10 +1347,10 @@ public class StateManager {
 			job.getStandardInfo().setDateOfCompletion(TimeStamp.getCurrentMillis());
 		case EndOfJob:
 			if(job.getProcessFailureCount() > 0) {
-				job.setCompletion(JobCompletionType.Error, rationale);
+				job.setCompletion(JobCompletionType.Warning, new Rationale("all work items completed, but job process failure(s) occurred"));
 			}
 			else if(job.getProcessInitFailureCount() > 0) {
-				job.setCompletion(JobCompletionType.Error, rationale);
+				job.setCompletion(JobCompletionType.Warning, new Rationale("all work items completed, but job process initialization failure(s) occurred"));
 			}
 			else {
 				try {

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccCompletionType.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccCompletionType.java?rev=1512233&r1=1512232&r2=1512233&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccCompletionType.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccCompletionType.java Fri Aug  9 10:15:04 2013
@@ -27,6 +27,7 @@ public interface IDuccCompletionType ext
 		Lost,							// Job was terminated, but with lost work items (only, no error work items)
 		EndOfJob,						// Job finished without error
 		Error,							// Job finished with error
+		Warning,						// Job finished with warning
 		CanceledByUser,					// Job was canceled by user
 		CanceledByAdministrator,		// Job was canceled by administrator
 		CanceledByDriver,				// Job was canceled by driver