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 wa...@apache.org on 2015/04/09 19:35:26 UTC
hadoop git commit: YARN-3466. Fix RM nodes web page to sort by node
HTTP-address, #containers and node-label column. (Jason Lowe via wangda)
Repository: hadoop
Updated Branches:
refs/heads/trunk 3fe61e0bb -> 1885141e9
YARN-3466. Fix RM nodes web page to sort by node HTTP-address, #containers and node-label column. (Jason Lowe via wangda)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1885141e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1885141e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1885141e
Branch: refs/heads/trunk
Commit: 1885141e90837252934192040a40047c7adbc1b5
Parents: 3fe61e0
Author: Wangda Tan <wa...@apache.org>
Authored: Thu Apr 9 10:35:12 2015 -0700
Committer: Wangda Tan <wa...@apache.org>
Committed: Thu Apr 9 10:35:12 2015 -0700
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 +++
.../server/resourcemanager/webapp/NodesPage.java | 18 +++++++++++-------
2 files changed, 14 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1885141e/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 914bba0..c6c56d3 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -909,6 +909,9 @@ Release 2.7.0 - UNRELEASED
YARN-3430. Made headroom data available on app attempt page of RM WebUI.
(Xuan Gong via zjshen)
+ YARN-3466. Fix RM nodes web page to sort by node HTTP-address, #containers
+ and node-label column (Jason Lowe via wangda)
+
Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1885141e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodesPage.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/NodesPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodesPage.java
index 13e0835..a2bab0c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodesPage.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodesPage.java
@@ -65,14 +65,18 @@ class NodesPage extends RmView {
String type = $(NODE_STATE);
String labelFilter = $(NODE_LABEL, CommonNodeLabelsManager.ANY).trim();
TBODY<TABLE<Hamlet>> tbody =
- html.table("#nodes").thead().tr().th(".nodelabels", "Node Labels")
- .th(".rack", "Rack").th(".state", "Node State")
+ html.table("#nodes").thead().tr()
+ .th(".nodelabels", "Node Labels")
+ .th(".rack", "Rack")
+ .th(".state", "Node State")
.th(".nodeaddress", "Node Address")
.th(".nodehttpaddress", "Node HTTP Address")
.th(".lastHealthUpdate", "Last health-update")
.th(".healthReport", "Health-report")
- .th(".containers", "Containers").th(".mem", "Mem Used")
- .th(".mem", "Mem Avail").th(".vcores", "VCores Used")
+ .th(".containers", "Containers")
+ .th(".mem", "Mem Used")
+ .th(".mem", "Mem Avail")
+ .th(".vcores", "VCores Used")
.th(".vcores", "VCores Avail")
.th(".nodeManagerVersion", "Version")._()._().tbody();
NodeState stateFilter = null;
@@ -168,10 +172,10 @@ class NodesPage extends RmView {
private String nodesTableInit() {
StringBuilder b = tableInit().append(", aoColumnDefs: [");
- b.append("{'bSearchable': false, 'aTargets': [ 6 ]}");
+ b.append("{'bSearchable': false, 'aTargets': [ 7 ]}");
b.append(", {'sType': 'title-numeric', 'bSearchable': false, "
- + "'aTargets': [ 7, 8 ] }");
- b.append(", {'sType': 'title-numeric', 'aTargets': [ 4 ]}");
+ + "'aTargets': [ 8, 9 ] }");
+ b.append(", {'sType': 'title-numeric', 'aTargets': [ 5 ]}");
b.append("]}");
return b.toString();
}