You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by nd...@apache.org on 2015/02/25 04:08:47 UTC
hbase git commit: HBASE-13086 Show ZK root node on Master WebUI
Repository: hbase
Updated Branches:
refs/heads/master 913ea2c22 -> c651271f5
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/c651271f
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c651271f
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c651271f
Branch: refs/heads/master
Commit: c651271f5759f39f282099999a50ab88a62d86b7
Parents: 913ea2c
Author: Nick Dimiduk <nd...@apache.org>
Authored: Tue Feb 24 19:03:20 2015 -0800
Committer: Nick Dimiduk <nd...@apache.org>
Committed: Tue Feb 24 19:04:12 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/c651271f/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 575dcdf..b428d98 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
@@ -371,6 +371,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/c651271f/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 c83f295..ceda843 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
@@ -255,6 +255,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>