| commit | e82e7c597a130bb7a4e4b3132be85b7099961a2d | [log] [tgz] |
|---|---|---|
| author | Peter Bacsko <pbacsko@cloudera.com> | Fri Mar 05 15:56:56 2021 +0100 |
| committer | Peter Bacsko <pbacsko@cloudera.com> | Fri Mar 05 15:56:56 2021 +0100 |
| tree | 4e6e63e48028a587aefc29e1c6b25d1678b303c4 | |
| parent | 077411675679900f94adba5329d0e33a4a528793 [diff] |
YARN-10640. Adjust the queue Configured capacity to Configured weight number for weight mode in UI. Contributed by Qi Zhu.
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java index 47c888d..8212a72 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java
@@ -159,8 +159,12 @@ __("Used Capacity:", appendPercent(resourceUsages.getUsed(), capacities.getUsedCapacity() / 100)) - .__("Configured Capacity:", - capacities.getConfiguredMinResource() == null ? + .__(capacities.getWeight() != -1 ? + "Configured Weight:" : + "Configured Capacity:", + capacities.getWeight() != -1 ? + capacities.getWeight() : + capacities.getConfiguredMinResource() == null ? Resources.none().toString() : capacities.getConfiguredMinResource().toString()) .__("Configured Max Capacity:",