svn commit: r1458333 - /uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/RmJob.java

[ch...@apache.org]

Author: challngr
Date: Tue Mar 19 15:30:04 2013
New Revision: 1458333

URL: http://svn.apache.org/r1458333
Log:
UIMA-2754
Update job cap to lesser of its process_max and the resource class's init cap if the job gets
evicted down to 0.

Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/RmJob.java

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/RmJob.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/RmJob.java?rev=1458333&r1=1458332&r2=1458333&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/RmJob.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/RmJob.java Tue Mar 19 15:30:04 2013
@@ -1013,6 +1013,7 @@ public class RmJob
             } else  if ( resource_class.isExpandByDoubling() ) {
                 if ( (assignedShares.size() == 0) ) {
                     actual_cap = Math.max(1, resource_class.getInitializationCap());   // if we shrink to 0, need to restart from the init cap
+                    actual_cap = Math.min(base_cap, actual_cap);                       // must re-min this in case we have a base cap < class init cap
                 } else {
                     actual_cap = Math.min(potential_cap, assignedShares.size() * 2);
                 }