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 ll...@apache.org on 2011/06/27 21:06:28 UTC
svn commit: r1140271 - in /hadoop/common/branches/MR-279/mapreduce:
CHANGES.txt
yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NodePage.java
Author: llu
Date: Mon Jun 27 19:06:28 2011
New Revision: 1140271
URL: http://svn.apache.org/viewvc?rev=1140271&view=rev
Log:
MAPREDUCE-2625. Add version info to nodemanager info page. (Jonathan Eagles via llu)
Modified:
hadoop/common/branches/MR-279/mapreduce/CHANGES.txt
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NodePage.java
Modified: hadoop/common/branches/MR-279/mapreduce/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/CHANGES.txt?rev=1140271&r1=1140270&r2=1140271&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/CHANGES.txt (original)
+++ hadoop/common/branches/MR-279/mapreduce/CHANGES.txt Mon Jun 27 19:06:28 2011
@@ -5,6 +5,9 @@ Trunk (unreleased changes)
MAPREDUCE-279
+ MAPREDUCE-2625. Add version info to nodemanager info page.
+ (Jonathan Eagles via llu)
+
MAPREDUCE-2618. Fix NPE in 0 map 0 reduce jobs. (Jeffrey Naisbitt via llu)
Fix some invalid transitions in the RM. (vinodkv via ddas)
Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NodePage.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NodePage.java?rev=1140271&r1=1140270&r2=1140271&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NodePage.java (original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NodePage.java Mon Jun 27 19:06:28 2011
@@ -23,6 +23,8 @@ import static org.apache.hadoop.yarn.web
import java.util.Date;
+import org.apache.hadoop.util.VersionInfo;
+import org.apache.hadoop.yarn.util.YarnVersionInfo;
import org.apache.hadoop.yarn.server.nodemanager.Context;
import org.apache.hadoop.yarn.server.nodemanager.ResourceView;
import org.apache.hadoop.yarn.webapp.SubView;
@@ -68,7 +70,9 @@ public class NodePage extends NMView {
._("LastNodeHealthTime", new Date(
this.context.getNodeHealthStatus().getLastHealthReportTime()))
._("NodeHealthReport",
- this.context.getNodeHealthStatus().getHealthReport());
+ this.context.getNodeHealthStatus().getHealthReport())
+ ._("Node Manger Version:", YarnVersionInfo.getBuildVersion())
+ ._("Hadoop Version:", VersionInfo.getBuildVersion());
html._(InfoBlock.class);
}
}