From 0c90231374ef4265f68def3eab5d71c352fffb97 Mon Sep 17 00:00:00 2001
From: Enis Soztutar <enis@apache.org>
Date: Thu, 28 May 2015 18:42:59 -0700
Subject: [PATCH] HBASE-13801 Hadoop src checksum is shown instead of HBase src
 checksum in master / RS UI

---
 .../hbase/tmpl/master/MasterStatusTmpl.jamon    | 17 ++++++++++++++++-
 .../hbase/tmpl/regionserver/RSStatusTmpl.jamon  | 17 ++++++++++++++++-
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
index c89642dfff0..e8ca96b0837 100644
--- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
+++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
@@ -242,7 +242,7 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
                 </tr>
                 <tr>
                     <td>HBase Source Checksum</td>
-                    <td><% org.apache.hadoop.util.VersionInfo.getSrcChecksum() %></td>
+                    <td><% org.apache.hadoop.hbase.util.VersionInfo.getSrcChecksum() %></td>
                     <td>HBase source MD5 checksum</td>
                 </tr>
                 <tr>
@@ -255,6 +255,21 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
                     <td><% org.apache.hadoop.util.VersionInfo.getDate() %>, <% org.apache.hadoop.util.VersionInfo.getUser() %></td>
                     <td>When Hadoop version was compiled and by whom</td>
                 </tr>
+                <tr>
+                    <td>Hadoop Source Checksum</td>
+                    <td><% org.apache.hadoop.util.VersionInfo.getSrcChecksum() %></td>
+                    <td>Hadoop source MD5 checksum</td>
+                </tr>
+                <tr>
+                    <td>ZooKeeper Client Version</td>
+                    <td><% org.apache.zookeeper.Version.getVersion() %>, revision=<% org.apache.zookeeper.Version.getRevision() %></td>
+                    <td>ZooKeeper client version and revision</td>
+                </tr>
+                <tr>
+                    <td>ZooKeeper Client Compiled</td>
+                    <td><% org.apache.zookeeper.Version.getBuildDate() %></td>
+                    <td>When ZooKeeper client version was compiled</td>
+                </tr>
                 <tr>
                     <td>Zookeeper Quorum</td>
                     <%escape #n>
diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
index 49c3b5e8291..3d4764370d1 100644
--- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
+++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
@@ -142,7 +142,7 @@ org.apache.hadoop.hbase.zookeeper.MasterAddressTracker;
         </tr>
         <tr>
             <td>HBase Source Checksum</td>
-            <td><% org.apache.hadoop.util.VersionInfo.getSrcChecksum() %></td>
+            <td><% org.apache.hadoop.hbase.util.VersionInfo.getSrcChecksum() %></td>
             <td>HBase source MD5 checksum</td>
         </tr>
         <tr>
@@ -155,6 +155,21 @@ org.apache.hadoop.hbase.zookeeper.MasterAddressTracker;
             <td><% org.apache.hadoop.util.VersionInfo.getDate() %>, <% org.apache.hadoop.util.VersionInfo.getUser() %></td>
             <td>When Hadoop version was compiled and by whom</td>
         </tr>
+        <tr>
+            <td>Hadoop Source Checksum</td>
+            <td><% org.apache.hadoop.util.VersionInfo.getSrcChecksum() %></td>
+            <td>Hadoop source MD5 checksum</td>
+        </tr>
+        <tr>
+            <td>ZooKeeper Client Version</td>
+            <td><% org.apache.zookeeper.Version.getVersion() %>, revision=<% org.apache.zookeeper.Version.getRevision() %></td>
+            <td>ZooKeeper client version and revision</td>
+        </tr>
+        <tr>
+            <td>ZooKeeper Client Compiled</td>
+            <td><% org.apache.zookeeper.Version.getBuildDate() %></td>
+            <td>When ZooKeeper client version was compiled</td>
+        </tr>
         <tr>
             <td>Zookeeper Quorum</td>
             <td><% regionServer.getZooKeeper().getQuorum() %></td>