Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5233F17C7B for ; Wed, 3 Jun 2015 00:33:51 +0000 (UTC) Received: (qmail 95432 invoked by uid 500); 2 Jun 2015 21:47:11 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 95391 invoked by uid 500); 2 Jun 2015 21:47:11 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 95377 invoked by uid 99); 2 Jun 2015 21:47:11 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Jun 2015 21:47:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4CF49DFB3B; Tue, 2 Jun 2015 21:47:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: enis@apache.org To: commits@hbase.apache.org Message-Id: <5028b23eecf244cebd9bc5b8f738f9ff@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-13768 ZooKeeper znodes are bootstrapped with insecure ACLs in a secure configuration (ADDENDUM for meta znode) Date: Tue, 2 Jun 2015 21:47:11 +0000 (UTC) Repository: hbase Updated Branches: refs/heads/0.98 5f570733b -> 8defd4931 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/8defd493 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8defd493 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8defd493 Branch: refs/heads/0.98 Commit: 8defd4931273f0f2f4c02be4d94bf2fc8691b812 Parents: 5f57073 Author: Enis Soztutar Authored: Tue Jun 2 14:43:26 2015 -0700 Committer: Enis Soztutar Committed: Tue Jun 2 14:45:50 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/8defd493/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 559c21f..76a8bfd 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 @@ -202,6 +202,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/8defd493/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));