YARN-7116. CapacityScheduler Web UI: Queue's AM usage is always show on per-user's AM usage. Contributed by Wangda Tan.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f9e0cc8c Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f9e0cc8c Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f9e0cc8c Branch: refs/heads/HADOOP-13345 Commit: f9e0cc8cdca387bf2811c07beccae4af07362952 Parents: ac12e15 Author: Sunil G <sun...@apache.org> Authored: Thu Aug 31 18:42:01 2017 +0530 Committer: Sunil G <sun...@apache.org> Committed: Thu Aug 31 18:42:01 2017 +0530 ---------------------------------------------------------------------- .../server/resourcemanager/webapp/CapacitySchedulerPage.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f9e0cc8c/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 f3ab5b0..93e1c97 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 @@ -228,9 +228,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-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org