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 2014/02/17 15:10:10 UTC
svn commit: r1569000 -
/uima/sandbox/uima-ducc/branches/uima-ducc-1.0.0/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java
Author: degenaro
Date: Mon Feb 17 14:10:09 2014
New Revision: 1569000
URL: http://svn.apache.org/r1569000
Log:
UIMA-3624 DUCC Orchestrator (OR) should round up when calculating shares needed
Modified:
uima/sandbox/uima-ducc/branches/uima-ducc-1.0.0/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java
Modified: uima/sandbox/uima-ducc/branches/uima-ducc-1.0.0/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/branches/uima-ducc-1.0.0/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java?rev=1569000&r1=1568999&r2=1569000&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/branches/uima-ducc-1.0.0/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java (original)
+++ uima/sandbox/uima-ducc/branches/uima-ducc-1.0.0/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java Mon Feb 17 14:10:09 2014
@@ -577,12 +577,19 @@ public class StateManager {
long error = jdStatusReport.getWorkItemsProcessingError();
long lost = jdStatusReport.getWorkItemsLost();
long todo = total - (done + error + lost);
+ long tps = job.getSchedulingInfo().getIntThreadsPerShare();
+ long numShares = 0;
+ if(todo%tps > 0) {
+ numShares = 1;
+ }
+ numShares += todo / tps;
+ long adjTodo = numShares * tps;
if(capacity > 0) {
- if(todo < capacity) {
- retVal = true;
+ if(adjTodo < capacity) {
+ retVal = true;
}
}
- logger.info(methodName, job.getDuccId(), "todo:"+todo+" "+"capacity:"+capacity+" "+"excess:"+retVal);
+ logger.info(methodName, job.getDuccId(), "todo:"+todo+" "+"adjTodo:"+adjTodo+" "+"capacity:"+capacity+" "+"excess:"+retVal);
}
else {
logger.info(methodName, job.getDuccId(), "todo:"+"?"+" "+"capacity:"+"?"+" "+"excess:"+retVal);