Repository: hadoop Updated Branches: refs/heads/trunk bdbd10fde -> f55d21d89
YARN-3593. Add label-type and Improve "DEFAULT_PARTITION" in Node Labels Page. (Naganarasimha G R via wangda) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f55d21d8 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f55d21d8 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f55d21d8 Branch: refs/heads/trunk Commit: f55d21d89448b81eba6ecbaa4d57bf535461ce73 Parents: bdbd10f Author: Wangda Tan <wan...@apache.org> Authored: Fri May 8 12:04:50 2015 -0700 Committer: Wangda Tan <wan...@apache.org> Committed: Fri May 8 12:04:50 2015 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../yarn/server/resourcemanager/webapp/NodeLabelsPage.java | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f55d21d8/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index eb27152..7927d43 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -199,6 +199,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 http://git-wip-us.apache.org/repos/asf/hadoop/blob/f55d21d8/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodeLabelsPage.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/NodeLabelsPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodeLabelsPage.java index 7458558..b0b301a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodeLabelsPage.java +++ b/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()
