Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 8C9EE200D1A for ; Mon, 9 Oct 2017 11:28:58 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 8B0BA1609E0; Mon, 9 Oct 2017 09:28:58 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D221E1609BB for ; Mon, 9 Oct 2017 11:28:57 +0200 (CEST) Received: (qmail 88719 invoked by uid 500); 9 Oct 2017 09:28:57 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 88710 invoked by uid 99); 9 Oct 2017 09:28:56 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Oct 2017 09:28:56 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D63E4DFF0F; Mon, 9 Oct 2017 09:28:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sunilg@apache.org To: common-commits@hadoop.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: YARN-7245. Max AM Resource column in Active Users Info section of Capacity Scheduler UI page should be updated per-user. Contributed by Eric Payne. Date: Mon, 9 Oct 2017 09:28:56 +0000 (UTC) archived-at: Mon, 09 Oct 2017 09:28:58 -0000 Repository: hadoop Updated Branches: refs/heads/branch-2.8 99b7ced3b -> b41a70275 YARN-7245. Max AM Resource column in Active Users Info section of Capacity Scheduler UI page should be updated per-user. Contributed by Eric Payne. (cherry picked from commit 8137254a1f4367974bf1883f1982e31ab2865107) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b41a7027 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b41a7027 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b41a7027 Branch: refs/heads/branch-2.8 Commit: b41a702751c8bafaf1dd435f22ebd8bc0fa67fee Parents: 99b7ced Author: Sunil G Authored: Mon Oct 9 14:39:41 2017 +0530 Committer: Sunil G Committed: Mon Oct 9 14:58:42 2017 +0530 ---------------------------------------------------------------------- .../yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b41a7027/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 ab01e87..46639ff 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 @@ -220,8 +220,7 @@ class CapacitySchedulerPage extends RmView { ArrayList users = lqinfo.getUsers().getUsersList(); for (UserInfo userInfo : users) { ResourceInfo resourcesUsed = userInfo.getResourcesUsed(); - PartitionResourcesInfo resourceUsages = lqinfo - .getResources() + PartitionResourcesInfo resourceUsages = userInfo.getResourceUsageInfo() .getPartitionResourceUsageInfo((nodeLabel == null) ? "" : nodeLabel); if (nodeLabel != null) { resourcesUsed = userInfo.getResourceUsageInfo() --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org