You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2015/06/02 00:08:43 UTC
hbase git commit: HBASE-13801 Hadoop src checksum is shown instead of
HBase src checksum in master / RS UI
Repository: hbase
Updated Branches:
refs/heads/0.98 86d1637f6 -> 72c7d23f8
HBASE-13801 Hadoop src checksum is shown instead of HBase src checksum in master / RS UI
Conflicts:
hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/72c7d23f
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/72c7d23f
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/72c7d23f
Branch: refs/heads/0.98
Commit: 72c7d23f8ed52b931c929b708fec44b8afff764d
Parents: 86d1637
Author: Enis Soztutar <en...@apache.org>
Authored: Thu May 28 18:42:59 2015 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Tue Jun 2 08:05:07 2015 +1000
----------------------------------------------------------------------
.../hbase/tmpl/master/MasterStatusTmpl.jamon | 20 +++++++++++++
.../hbase/tmpl/regionserver/RSStatusTmpl.jamon | 30 ++++++++++++++++++++
2 files changed, 50 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/72c7d23f/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
----------------------------------------------------------------------
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 1e4ac0c..1d97708 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
@@ -240,6 +240,11 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
<td>When HBase version was compiled and by whom</td>
</tr>
<tr>
+ <td>HBase Source Checksum</td>
+ <td><% org.apache.hadoop.hbase.util.VersionInfo.getSrcChecksum() %></td>
+ <td>HBase source MD5 checksum</td>
+ </tr>
+ <tr>
<td>Hadoop Version</td>
<td><% org.apache.hadoop.util.VersionInfo.getVersion() %>, r<% org.apache.hadoop.util.VersionInfo.getRevision() %></td>
<td>Hadoop version and revision</td>
@@ -250,6 +255,21 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
<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>
<td> <% formatZKString() %> </td>
http://git-wip-us.apache.org/repos/asf/hbase/blob/72c7d23f/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
----------------------------------------------------------------------
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 ec93e27..9dedd8e 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
@@ -141,6 +141,36 @@ org.apache.hadoop.hbase.zookeeper.MasterAddressTracker;
<td>When HBase version was compiled and by whom</td>
</tr>
<tr>
+ <td>HBase Source Checksum</td>
+ <td><% org.apache.hadoop.hbase.util.VersionInfo.getSrcChecksum() %></td>
+ <td>HBase source MD5 checksum</td>
+ </tr>
+ <tr>
+ <td>Hadoop Version</td>
+ <td><% org.apache.hadoop.util.VersionInfo.getVersion() %>, revision=<% org.apache.hadoop.util.VersionInfo.getRevision() %></td>
+ <td>Hadoop version and revision</td>
+ </tr>
+ <tr>
+ <td>Hadoop Compiled</td>
+ <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>
<td>Addresses of all registered ZK servers</td>