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 2014/04/17 19:59:21 UTC
svn commit: r1588322 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler:
NodePool.java Scheduler.java
Author: challngr
Date: Thu Apr 17 17:59:21 2014
New Revision: 1588322
URL: http://svn.apache.org/r1588322
Log:
UIMA-3755
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/NodePool.java
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/NodePool.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/NodePool.java?rev=1588322&r1=1588321&r2=1588322&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/NodePool.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/NodePool.java Thu Apr 17 17:59:21 2014
@@ -743,7 +743,11 @@ class NodePool
void nodeLeaves(Machine m)
{
String methodName = "nodeLeaves";
+
+ logger.info(methodName, null, "Node leaves:", m.getId());
if ( allMachines.containsKey(m.key()) ) {
+ logger.info(methodName, null, "Looking for shares to clear", m.getId());
+
int order = m.getShareOrder();
String name = m.getId();
String ip = m .getIp();
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java?rev=1588322&r1=1588321&r2=1588322&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java Thu Apr 17 17:59:21 2014
@@ -1182,10 +1182,14 @@ public class Scheduler
logger.info(methodName, j.getId(), "Set fixed bit for FIXED job");
s.setShareOrder(share_order);
s.setFixed();
+ j.markComplete(); // in recovery: if there are any shares at all for this job
+ // we know it once had all its shares so its allocation is complete
break;
case RESERVE:
logger.info(methodName, j.getId(), "Set fixed bit for RESERVE job");
s.setFixed();
+ j.markComplete(); // in recovery: if there are any shares at all for this job
+ // we know it once had all its shares so its allocation is complete
break;
}