From 30e198a127b3619880d534c01997237ac4c0ec56 Mon Sep 17 00:00:00 2001 From: Benjamin Teke Date: Thu, 26 Aug 2021 11:19:36 +0200 Subject: [PATCH] YARN-10646. Fix TestCapacitySchedulerWeightMode.getCSConfWithLabelsParentUsePctChildUseWeight test based on the description in comment. --- .../capacity/TestCapacitySchedulerWeightMode.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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/TestCapacitySchedulerWeightMode.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/TestCapacitySchedulerWeightMode.java index 171123a6ce810..982a2747994a2 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/TestCapacitySchedulerWeightMode.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/TestCapacitySchedulerWeightMode.java @@ -228,23 +228,23 @@ public static Configuration getCSConfWithLabelsParentUsePctChildUseWeight( // Define 2nd-level queues conf.setQueues(A, new String[] { "a1" }); - conf.setCapacityByLabel(A1, RMNodeLabelsManager.NO_LABEL, 100); + conf.setLabeledQueueWeight(A1, RMNodeLabelsManager.NO_LABEL, 100); conf.setMaximumCapacity(A1, 100); conf.setAccessibleNodeLabels(A1, toSet("x", "y")); conf.setDefaultNodeLabelExpression(A1, "x"); - conf.setCapacityByLabel(A1, "x", 100); - conf.setCapacityByLabel(A1, "y", 100); + conf.setLabeledQueueWeight(A1, "x", 100); + conf.setLabeledQueueWeight(A1, "y", 100); conf.setQueues(B, new String[] { "b1", "b2" }); - conf.setCapacityByLabel(B1, RMNodeLabelsManager.NO_LABEL, 50); + conf.setLabeledQueueWeight(B1, RMNodeLabelsManager.NO_LABEL, 50); conf.setMaximumCapacity(B1, 50); conf.setAccessibleNodeLabels(B1, RMNodeLabelsManager.EMPTY_STRING_SET); - conf.setCapacityByLabel(B2, RMNodeLabelsManager.NO_LABEL, 50); + conf.setLabeledQueueWeight(B2, RMNodeLabelsManager.NO_LABEL, 50); conf.setMaximumCapacity(B2, 50); conf.setAccessibleNodeLabels(B2, toSet("y", "z")); - conf.setCapacityByLabel(B2, "y", 100); - conf.setCapacityByLabel(B2, "z", 100); + conf.setLabeledQueueWeight(B2, "y", 100); + conf.setLabeledQueueWeight(B2, "z", 100); return conf; }