| commit | f9e0cc8cdca387bf2811c07beccae4af07362952 | [log] [tgz] |
|---|---|---|
| author | Sunil G <sunilg@apache.org> | Thu Aug 31 18:42:01 2017 +0530 |
| committer | Sunil G <sunilg@apache.org> | Thu Aug 31 18:42:01 2017 +0530 |
| tree | c366509c3a741f611c88207b03ea4b39a5bc59b8 | |
| parent | ac12e153a8cddb5def3b7f308c7d4d990b5b0436 [diff] |
YARN-7116. CapacityScheduler Web UI: Queue's AM usage is always show on per-user's AM usage. Contributed by Wangda Tan.
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 @@ 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())