hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndimi...@apache.org
Subject hbase git commit: HBASE-13086 Show ZK root node on Master WebUI
Date Wed, 25 Feb 2015 03:09:11 GMT
Repository: hbase
Updated Branches:
  refs/heads/0.98 3727bd3ca -> 5631f7761


HBASE-13086 Show ZK root node on Master WebUI


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5631f776
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5631f776
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5631f776

Branch: refs/heads/0.98
Commit: 5631f7761b05b7ef4a509b3b006e39ab2be1b393
Parents: 3727bd3
Author: Nick Dimiduk <ndimiduk@apache.org>
Authored: Tue Feb 24 19:03:20 2015 -0800
Committer: Nick Dimiduk <ndimiduk@apache.org>
Committed: Tue Feb 24 19:07:50 2015 -0800

----------------------------------------------------------------------
 .../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java   | 7 +++++++
 .../apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon    | 5 +++++
 2 files changed, 12 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/5631f776/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
index 02ba70e..1333eea 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
@@ -303,6 +303,13 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable
{
   }
 
   /**
+   * @return the base znode of this zookeeper connection instance.
+   */
+  public String getBaseZNode() {
+    return baseZNode;
+  }
+
+  /**
    * Method called from ZooKeeper for events and connection status.
    * <p>
    * Valid events are passed along to listeners.  Connection status changes

http://git-wip-us.apache.org/repos/asf/hbase/blob/5631f776/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 a518cca..f0f6ee7 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
@@ -249,6 +249,11 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
                     <td>Addresses of all registered ZK servers. For more, see <a
href="/zk.jsp">zk dump</a>.</td>
                 </tr>
                 <tr>
+                    <td>Zookeeper Base Path</td>
+                    <td> <% master.getZooKeeper().getBaseZNode() %></td>
+                    <td>Root node of this cluster in ZK.</td>
+                </tr>
+                <tr>
                     <td>HBase Root Directory</td>
                     <td><% FSUtils.getRootDir(master.getConfiguration()).toString()
%></td>
                     <td>Location of HBase home directory</td>


Mime
View raw message