Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 373DC181BF for ; Thu, 31 Mar 2016 21:35:31 +0000 (UTC) Received: (qmail 2084 invoked by uid 500); 31 Mar 2016 21:35:30 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 2020 invoked by uid 500); 31 Mar 2016 21:35:30 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 2008 invoked by uid 99); 31 Mar 2016 21:35:30 -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; Thu, 31 Mar 2016 21:35:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4D5C6DFC8E; Thu, 31 Mar 2016 21:35:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wangda@apache.org To: common-commits@hadoop.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: YARN-4634. Scheduler UI/Metrics need to consider cases like non-queue label mappings. (Sunil G via wangda) Date: Thu, 31 Mar 2016 21:35:30 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/trunk 0dd9bcab9 -> 12b11e2e6 YARN-4634. Scheduler UI/Metrics need to consider cases like non-queue label mappings. (Sunil G via wangda) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/12b11e2e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/12b11e2e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/12b11e2e Branch: refs/heads/trunk Commit: 12b11e2e688158404feeb3ded37eb6cccad4ea5c Parents: 0dd9bca Author: Wangda Tan Authored: Thu Mar 31 14:32:37 2016 -0700 Committer: Wangda Tan Committed: Thu Mar 31 14:35:18 2016 -0700 ---------------------------------------------------------------------- .../webapp/CapacitySchedulerPage.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/12b11e2e/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 033152a..5abc250 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 @@ -405,8 +405,20 @@ class CapacitySchedulerPage extends RmView { CapacitySchedulerInfo sinfo = new CapacitySchedulerInfo(root, cs); csqinfo.csinfo = sinfo; - if (null == nodeLabelsInfo || (nodeLabelsInfo.size() == 1 - && nodeLabelsInfo.get(0).getLabelName().isEmpty())) { + boolean hasAnyLabelLinkedToNM = false; + if (null != nodeLabelsInfo) { + for (RMNodeLabel label : nodeLabelsInfo) { + if (label.getLabelName().length() == 0) { + // Skip DEFAULT_LABEL + continue; + } + if (label.getNumActiveNMs() > 0) { + hasAnyLabelLinkedToNM = true; + break; + } + } + } + if (!hasAnyLabelLinkedToNM) { used = sinfo.getUsedCapacity() / 100; //label is not enabled in the cluster or there's only "default" label, ul.li().