You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by en...@apache.org on 2015/06/02 23:44:14 UTC

hbase git commit: HBASE-13768 ZooKeeper znodes are bootstrapped with insecure ACLs in a secure configuration (ADDENDUM for meta znode)

Repository: hbase
Updated Branches:
  refs/heads/branch-1.0 5ac78439a -> 20337f4f2


HBASE-13768 ZooKeeper znodes are bootstrapped with insecure ACLs in a secure configuration (ADDENDUM for meta znode)


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

Branch: refs/heads/branch-1.0
Commit: 20337f4f2a4b62a31097e961bdec01edf40a79bf
Parents: 5ac7843
Author: Enis Soztutar <en...@apache.org>
Authored: Tue Jun 2 14:43:26 2015 -0700
Committer: Enis Soztutar <en...@apache.org>
Committed: Tue Jun 2 14:43:58 2015 -0700

----------------------------------------------------------------------
 .../java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java    | 1 +
 .../org/apache/hadoop/hbase/zookeeper/TestZooKeeperWatcher.java     | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/20337f4f/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 b3dc5ae..7b591f8 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
@@ -201,6 +201,7 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable {
     // than service lookup case is not a recommended design pattern.
     return
         node.equals(baseZNode) ||
+        node.equals(metaServerZNode) ||
         node.equals(getMasterAddressZNode()) ||
         node.equals(clusterIdZNode)||
         node.equals(rsZNode) ||

http://git-wip-us.apache.org/repos/asf/hbase/blob/20337f4f/hbase-client/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperWatcher.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperWatcher.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperWatcher.java
index 8e36b2d..21d2612 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperWatcher.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperWatcher.java
@@ -37,6 +37,7 @@ public class TestZooKeeperWatcher {
       "testIsClientReadable", null, false);
 
     assertTrue(watcher.isClientReadable(watcher.baseZNode));
+    assertTrue(watcher.isClientReadable(watcher.metaServerZNode));
     assertTrue(watcher.isClientReadable(watcher.getMasterAddressZNode()));
     assertTrue(watcher.isClientReadable(watcher.clusterIdZNode));
     assertTrue(watcher.isClientReadable(watcher.tableZNode));