You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by tg...@apache.org on 2012/04/30 17:08:30 UTC
svn commit: r1332235 - in
/hadoop/common/branches/branch-2/hadoop-mapreduce-project: CHANGES.txt
hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodesPage.java
Author: tgraves
Date: Mon Apr 30 15:08:30 2012
New Revision: 1332235
URL: http://svn.apache.org/viewvc?rev=1332235&view=rev
Log:
merge -r 1332231:1332232 from trunk. FIXES: MAPREDUCE-4206
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodesPage.java
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1332235&r1=1332234&r2=1332235&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Mon Apr 30 15:08:30 2012
@@ -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
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodesPage.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodesPage.java?rev=1332235&r1=1332234&r2=1332235&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodesPage.java (original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodesPage.java Mon Apr 30 15:08:30 2012
@@ -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();
}
}