diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/resource/TestResourceCalculator.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/resource/TestResourceCalculator.java index 5f3ed196048..f7e72464c92 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/resource/TestResourceCalculator.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/resource/TestResourceCalculator.java @@ -324,12 +324,12 @@ public void testNormalize() { Resource max = Resource.newInstance(8 * 1024, 8); Resource increment = Resource.newInstance(1024, 4); if (resourceCalculator instanceof DefaultResourceCalculator) { - Resource result = Resources.normalize(resourceCalculator, + Resource result = resourceCalculator.normalize( ask, min, max, increment); assertEquals(2 * 1024, result.getMemorySize()); } else if (resourceCalculator instanceof DominantResourceCalculator) { - Resource result = Resources.normalize(resourceCalculator, + Resource result = resourceCalculator.normalize( ask, min, max, increment); assertEquals(2 * 1024, result.getMemorySize()); @@ -343,12 +343,12 @@ public void testNormalize() { max = Resource.newInstance(8 * 1024, 8); increment = Resource.newInstance(1024, 1); if (resourceCalculator instanceof DefaultResourceCalculator) { - Resource result = Resources.normalize(resourceCalculator, + Resource result = resourceCalculator.normalize( ask, min, max, increment); assertEquals(2 * 1024, result.getMemorySize()); } else if (resourceCalculator instanceof DominantResourceCalculator) { - Resource result = Resources.normalize(resourceCalculator, + Resource result = resourceCalculator.normalize( ask, min, max, increment); assertEquals(2 * 1024, result.getMemorySize()); @@ -362,12 +362,12 @@ public void testNormalize() { max = Resource.newInstance(8 * 1024, 8); increment = Resource.newInstance(1024, 1); if (resourceCalculator instanceof DefaultResourceCalculator) { - Resource result = Resources.normalize(resourceCalculator, + Resource result = resourceCalculator.normalize( ask, min, max, increment); assertEquals(8 * 1024, result.getMemorySize()); } else if (resourceCalculator instanceof DominantResourceCalculator) { - Resource result = Resources.normalize(resourceCalculator, + Resource result = resourceCalculator.normalize( ask, min, max, increment); assertEquals(8 * 1024, result.getMemorySize()); @@ -380,12 +380,12 @@ public void testNormalize() { max = Resource.newInstance(8 * 1024, 8); increment = Resource.newInstance(0, 0); if (resourceCalculator instanceof DefaultResourceCalculator) { - Resource result = Resources.normalize(resourceCalculator, + Resource result = resourceCalculator.normalize( ask, min, max, increment); assertEquals(2 * 1024, result.getMemorySize()); } else if (resourceCalculator instanceof DominantResourceCalculator) { - Resource result = Resources.normalize(resourceCalculator, + Resource result = resourceCalculator.normalize( ask, min, max, increment); assertEquals(2 * 1024, result.getMemorySize()); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/scheduler/OpportunisticContainerAllocator.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/scheduler/OpportunisticContainerAllocator.java index 1cec3dac11b..13c90f02c09 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/scheduler/OpportunisticContainerAllocator.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/scheduler/OpportunisticContainerAllocator.java @@ -591,7 +591,7 @@ private Container createContainer(long rmIdentifier, long tokenExpiry, private Resource normalizeCapability(AllocationParams appParams, ResourceRequest ask) { - return Resources.normalize(RESOURCE_CALCULATOR, + return RESOURCE_CALCULATOR.normalize( ask.getCapability(), appParams.minResource, appParams.maxResource, appParams.incrementResource); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerUtils.java index 9a02b6e75ca..110e4518d2b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerUtils.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerUtils.java @@ -220,8 +220,7 @@ public static Resource getNormalizedResource( Resource minimumResource, Resource maximumResource, Resource incrementResource) { - Resource normalized = Resources.normalize( - resourceCalculator, ask, minimumResource, + Resource normalized = resourceCalculator.normalize(ask, minimumResource, maximumResource, incrementResource); return normalized; } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AbstractCSQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AbstractCSQueue.java index 2c9f9a37255..f3d680e2c52 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AbstractCSQueue.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AbstractCSQueue.java @@ -540,7 +540,7 @@ public Resource getEffectiveCapacity(String label) { @Override public Resource getEffectiveCapacityDown(String label, Resource factor) { - return Resources.normalizeDown(resourceCalculator, + return resourceCalculator.normalizeDown( getQueueResourceQuotas().getEffectiveMinResource(label), minimumAllocation); } @@ -553,7 +553,7 @@ public Resource getEffectiveMaxCapacity(String label) { @Override public Resource getEffectiveMaxCapacityDown(String label, Resource factor) { - return Resources.normalizeDown(resourceCalculator, + return resourceCalculator.normalizeDown( getQueueResourceQuotas().getEffectiveMaxResource(label), minimumAllocation); }