Author: challngr
Date: Mon Aug 3 20:15:18 2015
New Revision: 1693966
URL: http://svn.apache.org/r1693966
Log:
UIMA-4358 Fix bad math calculating allotments.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/ResourceClass.java
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/ResourceClass.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/ResourceClass.java?rev=1693966&r1=1693965&r2=1693966&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/ResourceClass.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/ResourceClass.java
Mon Aug 3 20:15:18 2015
@@ -111,11 +111,10 @@ public class ResourceClass
this.enforce_memory = props.getBooleanProperty("enforce", true);
}
+ // For now, R 2.0.0 not configurable, and not cappable. Hope to
revive in future release.
this.fair_share_cap = Integer.MAX_VALUE; // UIMA-4275
if ( this.policy == Policy.FAIR_SHARE ) {
- fair_share_cap = props.getIntProperty("cap", Integer.MAX_VALUE);
- if (fair_share_cap == 0) fair_share_cap = Integer.MAX_VALUE;
this.share_weight = props.getIntProperty("weight");
if ( props.containsKey("expand-by-doubling") ) {
@@ -337,10 +336,11 @@ public class ResourceClass
// UIMA-4275
public boolean fairShareCapExceeded(IRmJob j)
{
- if ( policy != Policy.FAIR_SHARE ) return false;
-
- if ( j.getShareOrder() + countActiveShares() > calculateCap() ) return
true;
return false;
+ // if ( policy != Policy.FAIR_SHARE ) return false;
+
+ // if ( j.getShareOrder() + countActiveShares() > calculateCap() )
return true;
+ // return false;
}
/**
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=1693966&r1=1693965&r2=1693966&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
Mon Aug 3 20:15:18 2015
@@ -342,7 +342,7 @@ public class RmJob
public int countOccupancy()
{
- return assignedShares.size() + pendingShares.size();
+ return (assignedShares.size() + pendingShares.size()) * share_order;
// if ( (given_by_order == null) || (given_by_order[share_order] == 0)
) {
// // must use current allocation because we haven't been counted
yet
