You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by ch...@apache.org on 2013/10/24 19:30:08 UTC
svn commit: r1535450 - in /uima/sandbox/uima-ducc/trunk:
uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/JobManagerConverter.java
uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkJob.java
Author: challngr
Date: Thu Oct 24 17:30:07 2013
New Revision: 1535450
URL: http://svn.apache.org/r1535450
Log:
UIMA-3372 Fix isComplete in DuccWorkJob to include state "Completing" so RM knows there may still
be allocated resources for the job.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/JobManagerConverter.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkJob.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/JobManagerConverter.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/JobManagerConverter.java?rev=1535450&r1=1535449&r2=1535450&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/JobManagerConverter.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/JobManagerConverter.java Thu Oct 24 17:30:07 2013
@@ -692,13 +692,15 @@ public class JobManagerConverter
jobRemoved(w.getDuccId());
}
- // Todo : manage stuff that is diffs, not new, not deletions
+ //
+ // Stuff on the left is incoming. Stuff on the right is already in my map.
+ //
for( DuccMapValueDifference<IDuccWork> jd: diffmap ) {
IDuccWork r = jd.getRight();
IDuccWork l = jd.getLeft();
if ( ! l.isSchedulable() ) {
- logger.info(methodName, l.getDuccId(), "Removing unschedulable:", r.getStateObject(), "->", r.getStateObject());
+ logger.info(methodName, l.getDuccId(), "Removing unschedulable:", r.getStateObject(), "->", l.getStateObject());
jobRemoved(r.getDuccId());
} else {
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkJob.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/DuccWorkJob.java?rev=1535450&r1=1535449&r2=1535450&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkJob.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkJob.java Thu Oct 24 17:30:07 2013
@@ -171,6 +171,7 @@ public class DuccWorkJob extends ADuccWo
case WaitingForResources:
case Initializing:
case Running:
+ case Completing:
retVal = true;
break;
}