|
@@ -65,6 +65,7 @@ public class FairSharePolicy extends SchedulingPolicy {
|
|
|
private static class FairShareComparator implements Comparator<Schedulable>,
|
|
|
Serializable {
|
|
|
private static final long serialVersionUID = 5564969375856699313L;
|
|
|
+ private static final Resource ONE = Resources.createResource(1);
|
|
|
|
|
|
@Override
|
|
|
public int compare(Schedulable s1, Schedulable s2) {
|
|
@@ -78,11 +79,10 @@ public class FairSharePolicy extends SchedulingPolicy {
|
|
|
s1.getResourceUsage(), minShare1);
|
|
|
boolean s2Needy = Resources.lessThan(RESOURCE_CALCULATOR, null,
|
|
|
s2.getResourceUsage(), minShare2);
|
|
|
- Resource one = Resources.createResource(1);
|
|
|
minShareRatio1 = (double) s1.getResourceUsage().getMemory()
|
|
|
- / Resources.max(RESOURCE_CALCULATOR, null, minShare1, one).getMemory();
|
|
|
+ / Resources.max(RESOURCE_CALCULATOR, null, minShare1, ONE).getMemory();
|
|
|
minShareRatio2 = (double) s2.getResourceUsage().getMemory()
|
|
|
- / Resources.max(RESOURCE_CALCULATOR, null, minShare2, one).getMemory();
|
|
|
+ / Resources.max(RESOURCE_CALCULATOR, null, minShare2, ONE).getMemory();
|
|
|
useToWeightRatio1 = s1.getResourceUsage().getMemory() /
|
|
|
s1.getWeights().getWeight(ResourceType.MEMORY);
|
|
|
useToWeightRatio2 = s2.getResourceUsage().getMemory() /
|