YARN-4634. Scheduler UI/Metrics need to consider cases like non-queue…

… label mappings. (Sunil G via wangda)
xiangyuf · Mar 31, 2016 · 12b11e2 · 12b11e2
1 parent 0dd9bca
commit 12b11e2
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/...main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java b/...main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java
@@ -405,8 +405,20 @@ public void render(Block html) {
         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().