You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by pb...@apache.org on 2021/03/05 14:57:11 UTC
[hadoop] branch trunk updated: YARN-10640. Adjust the queue
Configured capacity to Configured weight number for weight mode in UI.
Contributed by Qi Zhu.
This is an automated email from the ASF dual-hosted git repository.
pbacsko pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new e82e7c5 YARN-10640. Adjust the queue Configured capacity to Configured weight number for weight mode in UI. Contributed by Qi Zhu.
e82e7c5 is described below
commit e82e7c597a130bb7a4e4b3132be85b7099961a2d
Author: Peter Bacsko <pb...@cloudera.com>
AuthorDate: Fri Mar 5 15:56:56 2021 +0100
YARN-10640. Adjust the queue Configured capacity to Configured weight number for weight mode in UI. Contributed by Qi Zhu.
---
.../yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
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 @@ class CapacitySchedulerPage extends RmView {
__("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:",
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org