Bladeren bron

MAPREDUCE-2625. Add version info to nodemanager info page. (Jonathan Eagles via llu)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-279@1140271 13f79535-47bb-0310-9956-ffa450edef68
Luke Lu 14 jaren geleden
bovenliggende
commit
83c30c9544

+ 3 - 0
mapreduce/CHANGES.txt

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

+ 5 - 1
mapreduce/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NodePage.java

@@ -23,6 +23,8 @@ import static org.apache.hadoop.yarn.webapp.view.JQueryUI.initID;
 
 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);
     }
   }