svn commit: r1508206 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm: JobManagerConverter.java scheduler/NodePool.java

[challngr]

Author: challngr
Date: Mon Jul 29 21:41:30 2013
New Revision: 1508206

URL: http://svn.apache.org/r1508206
Log:
UIMA-3129 Reenable purge bit.

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-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/NodePool.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=1508206&r1=1508205&r2=1508206&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
 Mon Jul 29 21:41:30 2013
@@ -566,11 +566,11 @@ public class JobManagerConverter
                     continue;
                 }
                 
-//                 if ( s.isPurged() ) {
-//                     IRmJob j = scheduler.getJob(jobid);
-//                     scheduler.signalCompletion(j, s);
-//                     logger.info(methodName, jobid, "Process", pl.getPID(), 
"marked complete because it is purged. State:", state);
-//                 }
+                if ( s.isPurged() ) {
+                    IRmJob j = scheduler.getJob(jobid);
+                    scheduler.signalCompletion(j, s);
+                    logger.info(methodName, jobid, "Process", pl.getPID(), 
"marked complete because it is purged. State:", state);
+                }
 
                 if ( ! s.update(jobid, mem, state, pl.getTimeWindowInit(), 
pl.getTimeWindowRun(), pid) ) {
                     // TODO: probably change to just a warning and cancel the 
job - for now I want an attention-getter

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=1508206&r1=1508205&r2=1508206&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
 Mon Jul 29 21:41:30 2013
@@ -751,10 +751,7 @@ class NodePool
                 IRmJob j = s.getJob();
                 j.shrinkByOne(s);
                 nPendingByOrder[order]++;
-                // NOTE: We are temporarily bypassing purge on node death - 
the shares will be 
-                //       evicted but by disabling the purge bit the OR will 
not acknowledge the
-                //       eviction until the affected node responds.  
-                // s.purge();
+                s.purge();          // This bet tells OR not to wait for 
confirmation from the agent
             }
 
             allMachines.remove(m.key());