Browse Source

YARN-3593. Add label-type and Improve "DEFAULT_PARTITION" in Node Labels Page. (Naganarasimha G R via wangda)

(cherry picked from commit f55d21d89448b81eba6ecbaa4d57bf535461ce73)
Wangda Tan 10 years ago
parent
commit
f8807839c6

+ 3 - 0
hadoop-yarn-project/CHANGES.txt

@@ -154,6 +154,9 @@ Release 2.8.0 - UNRELEASED
     YARN-20. More information for "yarn.resourcemanager.webapp.address" in 
     yarn-default.xml (Bartosz Ługowski vai tgraves)
 
+    YARN-3593. Add label-type and Improve "DEFAULT_PARTITION" in Node Labels Page. 
+    (Naganarasimha G R via wangda)
+
   OPTIMIZATIONS
 
     YARN-3339. TestDockerContainerExecutor should pull a single image and not

+ 6 - 1
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodeLabelsPage.java

@@ -49,6 +49,7 @@ public class NodeLabelsPage extends RmView {
           thead().
           tr().
           th(".name", "Label Name").
+          th(".type", "Label Type").
           th(".numOfActiveNMs", "Num Of Active NMs").
           th(".totalResource", "Total Resource").
           _()._().
@@ -58,8 +59,12 @@ public class NodeLabelsPage extends RmView {
       for (RMNodeLabel info : nlm.pullRMNodeLabelsInfo()) {
         TR<TBODY<TABLE<Hamlet>>> row =
             tbody.tr().td(
-                info.getLabelName().isEmpty() ? "<NO_LABEL>" : info
+                info.getLabelName().isEmpty() ? "<DEFAULT_PARTITION>" : info
                     .getLabelName());
+        String type =
+            (info.getIsExclusive()) ? "Exclusive Partition"
+                : "Non Exclusive Partition";
+        row = row.td(type);
         int nActiveNMs = info.getNumActiveNMs();
         if (nActiveNMs > 0) {
           row = row.td()