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 ep...@apache.org on 2017/09/22 17:09:31 UTC
hadoop git commit: YARN-7116. CapacityScheduler Web UI: Queue's AM
usage is always show on per-user's AM usage. Contributed by Wangda Tan.
Repository: hadoop
Updated Branches:
refs/heads/branch-2.8 dade7396a -> 1132f4825
YARN-7116. CapacityScheduler Web UI: Queue's AM usage is always show on per-user's AM usage. Contributed by Wangda Tan.
(cherry picked from commit f9e0cc8cdca387bf2811c07beccae4af07362952)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1132f482
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1132f482
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1132f482
Branch: refs/heads/branch-2.8
Commit: 1132f48253a4f9173cb77d0e01d8d4663dfc38e3
Parents: dade739
Author: Sunil G <su...@apache.org>
Authored: Thu Aug 31 18:42:01 2017 +0530
Committer: Eric Payne <ep...@apache.org>
Committed: Fri Sep 22 11:52:30 2017 -0500
----------------------------------------------------------------------
.../server/resourcemanager/webapp/CapacitySchedulerPage.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1132f482/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java
----------------------------------------------------------------------
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 6948b06..ab01e87 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
@@ -227,9 +227,10 @@ class CapacitySchedulerPage extends RmView {
resourcesUsed = userInfo.getResourceUsageInfo()
.getPartitionResourceUsageInfo(nodeLabel).getUsed();
}
- ResourceInfo amUsed = (resourceUsages.getAmUsed() == null)
- ? new ResourceInfo(Resources.none())
- : resourceUsages.getAmUsed();
+ ResourceInfo amUsed = userInfo.getAMResourcesUsed();
+ if (amUsed == null) {
+ amUsed = new ResourceInfo(Resources.none());
+ }
String highlightIfAsking =
userInfo.getIsActive() ? ACTIVE_USER : null;
tbody.tr().$style(highlightIfAsking).td(userInfo.getUsername())
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org