From 41ce1fa860f09ff1d77d08d714fc94c795584ec2 Mon Sep 17 00:00:00 2001 From: Thomas Graves Date: Mon, 30 Apr 2012 15:08:30 +0000 Subject: [PATCH] merge -r 1332231:1332232 from trunk. FIXES: MAPREDUCE-4206 git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332235 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../server/resourcemanager/webapp/NodesPage.java | 13 ++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 942c6f8a843..39106bb6f4c 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -318,6 +318,9 @@ Release 0.23.3 - UNRELEASED MAPREDUCE-4209. junit dependency in hadoop-mapreduce-client is missing scope test (Radim Kolar via bobby) + MAPREDUCE-4206. Sorting by Last Health-Update on the RM nodes page sorts + does not work correctly (Jonathon Eagles via tgraves) + Release 0.23.2 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodesPage.java b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodesPage.java index 13d5a743183..3cb42888cb1 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodesPage.java +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodesPage.java @@ -121,7 +121,8 @@ class NodesPage extends RmView { row.td().a("http://" + httpAddress, httpAddress)._(); } row.td(info.getHealthStatus()). - td(Times.format(info.getLastHealthUpdate())). + td().br().$title(String.valueOf(info.getLastHealthUpdate()))._(). + _(Times.format(info.getLastHealthUpdate()))._(). td(info.getHealthReport()). td(String.valueOf(info.getNumContainers())). td().br().$title(String.valueOf(usedMemory))._(). @@ -153,10 +154,12 @@ class NodesPage extends RmView { } private String nodesTableInit() { - StringBuilder b = tableInit().append(",aoColumnDefs:["); - b.append("{'bSearchable':false, 'aTargets': [7]} ,"); - b.append("{'sType':'title-numeric', 'bSearchable':false, " + - "'aTargets': [ 8, 9] }]}"); + StringBuilder b = tableInit().append(", aoColumnDefs: ["); + b.append("{'bSearchable': false, 'aTargets': [ 7 ]}"); + b.append(", {'sType': 'title-numeric', 'bSearchable': false, " + + "'aTargets': [ 8, 9 ] }"); + b.append(", {'sType': 'title-numeric', 'aTargets': [ 5 ]}"); + b.append("]}"); return b.toString(); } }