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 73d9e4c77b2aa4734845376d20fb76e6b91b6db0)

Conflicts:

	hadoop-yarn-project/CHANGES.txt

hadoop-yarn-project/CHANGES.txt

@@ -766,6 +766,9 @@ Release 2.7.0 - UNRELEASED
     YARN-3055. Fixed ResourceManager's DelegationTokenRenewer to not stop token
     renewal of applications part of a bigger workflow. (Daryn Sharp via vinodkv)
 
+    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

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