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 1885141e90)
This commit is contained in:
Wangda Tan 2015-04-09 10:35:12 -07:00
parent edf2f52d6d
commit 73d9e4c77b
2 changed files with 14 additions and 7 deletions

View File

@ -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

View File

@ -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();
}