Author: challngr
Date: Mon Jun 15 18:01:21 2015
New Revision: 1685648
URL: http://svn.apache.org/r1685648
Log:
UIMA-4358 Misplaced 'return' allowed UIMA-AS jobs in FIXED_SHARE class to be
evicted under some circumstances.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/NodepoolScheduler.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/NodepoolScheduler.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/NodepoolScheduler.java?rev=1685648&r1=1685647&r2=1685648&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/NodepoolScheduler.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/NodepoolScheduler.java
Mon Jun 15 18:01:21 2015
@@ -1252,7 +1252,7 @@ public class NodepoolScheduler
*/
void howMuchFixed(ArrayList<ResourceClass> rcs)
{
- String methodName = "howMuchFixedShare";
+ String methodName = "howMuchFixed";
if ( logger.isTrace() ) {
logger.info(methodName, null, "Scheduling FIXED SHARE for these
classes:");
@@ -1321,11 +1321,11 @@ public class NodepoolScheduler
logger.info(methodName, j.getId(), "Deferring, no machines
big enough for the request. NP", np.getId(),
"available[", np.countNSharesByOrder(order),
"]");
}
+ return;
} else {
logger.info(methodName, j.getId(), "Nodepool is out of shares:
NP", np.getId(),
"available[", np.countNSharesByOrder(order), "]");
}
- return;
}
int granted = getAllotmentForJob(j); // in nshares, processes
