You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by zj...@apache.org on 2015/05/09 02:42:18 UTC
[24/50] hadoop git commit: YARN-3593. Add label-type and Improve
"DEFAULT_PARTITION" in Node Labels Page. (Naganarasimha G R via wangda)
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/c535bb75
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c535bb75
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c535bb75
Branch: refs/heads/YARN-2928
Commit: c535bb75a3ee7620df1dcd40e83b1a29c9f17b88
Parents: a8514ac
Author: Wangda Tan <wa...@apache.org>
Authored: Fri May 8 12:04:50 2015 -0700
Committer: Zhijie Shen <zj...@apache.org>
Committed: Fri May 8 17:32:49 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/c535bb75/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 6ba819e..b2ed2a0 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -269,6 +269,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/c535bb75/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()