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/ParentQueue.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/ParentQueue.java index e32130fc4ed..638f69083bf 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/ParentQueue.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/ParentQueue.java @@ -1096,14 +1096,14 @@ private void deriveCapacityFromAbsoluteConfigurations(String label, // 3. Update absolute capacity as a float based on parent's minResource and // cluster resource. childQueue.getQueueCapacities().setAbsoluteCapacity(label, - (float) childQueue.getQueueCapacities().getCapacity() - / getQueueCapacities().getAbsoluteCapacity(label)); + childQueue.getQueueCapacities().getCapacity(label) + * getQueueCapacities().getAbsoluteCapacity(label)); // 4. Update absolute max-capacity as a float based on parent's maxResource // and cluster resource. childQueue.getQueueCapacities().setAbsoluteMaximumCapacity(label, - (float) childQueue.getQueueCapacities().getMaximumCapacity(label) - / getQueueCapacities().getAbsoluteMaximumCapacity(label)); + childQueue.getQueueCapacities().getMaximumCapacity(label) + * getQueueCapacities().getAbsoluteMaximumCapacity(label)); // Re-visit max applications for a queue based on absolute capacity if // needed. diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestAbsoluteResourceConfiguration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestAbsoluteResourceConfiguration.java index 298e1abcbd0..2eb3d7abe98 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestAbsoluteResourceConfiguration.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestAbsoluteResourceConfiguration.java @@ -33,6 +33,7 @@ public class TestAbsoluteResourceConfiguration { private static final int GB = 1024; + private static final float DELTA = 0.001f; private static final String QUEUEA = "queueA"; private static final String QUEUEB = "queueB"; @@ -544,6 +545,8 @@ public void testEffectiveResourceAfterIncreasingClusterResource() QUEUE_A_MINRES, qA.queueResourceQuotas.getEffectiveMinResource()); Assert.assertEquals("Effective Max resource for QUEUEA is not correct", QUEUE_A_MAXRES, qA.queueResourceQuotas.getEffectiveMaxResource()); + Assert.assertEquals(qA.getAbsoluteCapacity(), 0.4, DELTA); + Assert.assertEquals(qA.getAbsoluteMaximumCapacity(), 0.8, DELTA); ParentQueue qB = (ParentQueue) cs.getQueue(QUEUEB); Assert.assertNotNull(qB); @@ -555,6 +558,8 @@ public void testEffectiveResourceAfterIncreasingClusterResource() QUEUE_B_MINRES, qB.queueResourceQuotas.getEffectiveMinResource()); Assert.assertEquals("Effective Max resource for QUEUEB is not correct", QUEUE_B_MAXRES, qB.queueResourceQuotas.getEffectiveMaxResource()); + Assert.assertEquals(qB.getAbsoluteCapacity(), 0.2, DELTA); + Assert.assertEquals(qB.getAbsoluteMaximumCapacity(), 0.6, DELTA); LeafQueue qC = (LeafQueue) cs.getQueue(QUEUEC); Assert.assertNotNull(qC); @@ -566,18 +571,24 @@ public void testEffectiveResourceAfterIncreasingClusterResource() QUEUE_C_MINRES, qC.queueResourceQuotas.getEffectiveMinResource()); Assert.assertEquals("Effective Max resource for QUEUEC is not correct", QUEUE_C_MAXRES, qC.queueResourceQuotas.getEffectiveMaxResource()); + Assert.assertEquals(qC.getAbsoluteCapacity(), 0.2, DELTA); + Assert.assertEquals(qC.getAbsoluteMaximumCapacity(), 0.6, DELTA); LeafQueue qA1 = (LeafQueue) cs.getQueue(QUEUEA1); Assert.assertEquals("Effective Min resource for QUEUEA1 is not correct", QUEUE_A1_MINRES, qA1.queueResourceQuotas.getEffectiveMinResource()); Assert.assertEquals("Effective Max resource for QUEUEA1 is not correct", QUEUE_A_MAXRES, qA1.queueResourceQuotas.getEffectiveMaxResource()); + Assert.assertEquals(qA1.getAbsoluteCapacity(), 0.2, DELTA); + Assert.assertEquals(qA1.getAbsoluteMaximumCapacity(), 0.8, DELTA); LeafQueue qA2 = (LeafQueue) cs.getQueue(QUEUEA2); Assert.assertEquals("Effective Min resource for QUEUEA2 is not correct", QUEUE_A2_MINRES, qA2.queueResourceQuotas.getEffectiveMinResource()); Assert.assertEquals("Effective Max resource for QUEUEA2 is not correct", QUEUE_A_MAXRES, qA2.queueResourceQuotas.getEffectiveMaxResource()); + Assert.assertEquals(qA2.getAbsoluteCapacity(), 0.2, DELTA); + Assert.assertEquals(qA2.getAbsoluteMaximumCapacity(), 0.8, DELTA); LeafQueue qB1 = (LeafQueue) cs.getQueue(QUEUEB1); Assert.assertEquals("Min resource configured for QUEUEB1 is not correct", @@ -588,6 +599,8 @@ public void testEffectiveResourceAfterIncreasingClusterResource() QUEUE_B1_MINRES, qB1.queueResourceQuotas.getEffectiveMinResource()); Assert.assertEquals("Effective Max resource for QUEUEB1 is not correct", QUEUE_B_MAXRES, qB1.queueResourceQuotas.getEffectiveMaxResource()); + Assert.assertEquals(qB1.getAbsoluteCapacity(), 0.16, DELTA); + Assert.assertEquals(qB1.getAbsoluteMaximumCapacity(), 0.6, DELTA); // add new NM. rm.registerNode("127.0.0.3:1234", 125 * GB, 20); @@ -599,31 +612,43 @@ public void testEffectiveResourceAfterIncreasingClusterResource() QUEUE_A_MINRES, qA.queueResourceQuotas.getEffectiveMinResource()); Assert.assertEquals("Effective Max resource for QUEUEA is not correct", QUEUE_A_MAXRES, qA.queueResourceQuotas.getEffectiveMaxResource()); + Assert.assertEquals(qA.getAbsoluteCapacity(), 0.266, DELTA); + Assert.assertEquals(qA.getAbsoluteMaximumCapacity(), 0.533, DELTA); Assert.assertEquals("Effective Min resource for QUEUEB is not correct", QUEUE_B_MINRES, qB.queueResourceQuotas.getEffectiveMinResource()); Assert.assertEquals("Effective Max resource for QUEUEB is not correct", QUEUE_B_MAXRES, qB.queueResourceQuotas.getEffectiveMaxResource()); + Assert.assertEquals(qB.getAbsoluteCapacity(), 0.133, DELTA); + Assert.assertEquals(qB.getAbsoluteMaximumCapacity(), 0.4, DELTA); Assert.assertEquals("Effective Min resource for QUEUEC is not correct", QUEUE_C_MINRES, qC.queueResourceQuotas.getEffectiveMinResource()); Assert.assertEquals("Effective Max resource for QUEUEC is not correct", QUEUE_C_MAXRES, qC.queueResourceQuotas.getEffectiveMaxResource()); + Assert.assertEquals(qC.getAbsoluteCapacity(), 0.133, DELTA); + Assert.assertEquals(qC.getAbsoluteMaximumCapacity(), 0.4, DELTA); Assert.assertEquals("Effective Min resource for QUEUEB1 is not correct", QUEUE_B1_MINRES, qB1.queueResourceQuotas.getEffectiveMinResource()); Assert.assertEquals("Effective Max resource for QUEUEB1 is not correct", QUEUE_B_MAXRES, qB1.queueResourceQuotas.getEffectiveMaxResource()); + Assert.assertEquals(qB1.getAbsoluteCapacity(), 0.106, DELTA); + Assert.assertEquals(qB1.getAbsoluteMaximumCapacity(), 0.4, DELTA); Assert.assertEquals("Effective Min resource for QUEUEA1 is not correct", QUEUE_A1_MINRES, qA1.queueResourceQuotas.getEffectiveMinResource()); Assert.assertEquals("Effective Max resource for QUEUEA1 is not correct", QUEUE_A_MAXRES, qA1.queueResourceQuotas.getEffectiveMaxResource()); + Assert.assertEquals(qA1.getAbsoluteCapacity(), 0.133, DELTA); + Assert.assertEquals(qA1.getAbsoluteMaximumCapacity(), 0.533, DELTA); Assert.assertEquals("Effective Min resource for QUEUEA2 is not correct", QUEUE_A2_MINRES, qA2.queueResourceQuotas.getEffectiveMinResource()); Assert.assertEquals("Effective Max resource for QUEUEA2 is not correct", QUEUE_A_MAXRES, qA2.queueResourceQuotas.getEffectiveMaxResource()); + Assert.assertEquals(qA2.getAbsoluteCapacity(), 0.133, DELTA); + Assert.assertEquals(qA2.getAbsoluteMaximumCapacity(), 0.533, DELTA); rm.stop(); }