From 73d9e4c77b2aa4734845376d20fb76e6b91b6db0 Mon Sep 17 00:00:00 2001 From: Wangda Tan Date: Thu, 9 Apr 2015 10:35:12 -0700 Subject: [PATCH] YARN-3466. Fix RM nodes web page to sort by node HTTP-address, #containers and node-label column. (Jason Lowe via wangda) (cherry picked from commit 1885141e90837252934192040a40047c7adbc1b5) --- hadoop-yarn-project/CHANGES.txt | 3 +++ .../resourcemanager/webapp/NodesPage.java | 18 +++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 7674f5da566..6a3999f79b0 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -864,6 +864,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 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 13e08352065..a2bab0cea41 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> 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(); }