Repository: hbase Updated Branches: refs/heads/branch-1.3 323768148 -> c3cb42039
HBASE-17091 IntegrationTestZKAndFSPermissions failed with 'KeeperException' Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c3cb4203 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c3cb4203 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c3cb4203 Branch: refs/heads/branch-1.3 Commit: c3cb4203983244981e2f49784cd69ec21cb6910f Parents: 3237681 Author: Enis Soztutar <[email protected]> Authored: Tue Nov 15 13:09:25 2016 -0800 Committer: Enis Soztutar <[email protected]> Committed: Tue Nov 15 13:10:48 2016 -0800 ---------------------------------------------------------------------- .../hbase/test/IntegrationTestZKAndFSPermissions.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/c3cb4203/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestZKAndFSPermissions.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestZKAndFSPermissions.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestZKAndFSPermissions.java index 3845846..106e13a 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestZKAndFSPermissions.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestZKAndFSPermissions.java @@ -43,6 +43,7 @@ import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; import org.apache.hadoop.util.ToolRunner; import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.KeeperException.Code; +import org.apache.zookeeper.KeeperException.NoNodeException; import org.apache.zookeeper.ZooDefs.Ids; import org.apache.zookeeper.ZooDefs.Perms; import org.apache.zookeeper.data.ACL; @@ -168,7 +169,7 @@ public class IntegrationTestZKAndFSPermissions extends AbstractHBaseTool { } } catch (KeeperException ke) { // if we are not authenticated for listChildren, it is fine. - if (ke.code() != Code.NOAUTH) { + if (ke.code() != Code.NOAUTH && ke.code() != Code.NONODE) { throw ke; } } @@ -177,7 +178,14 @@ public class IntegrationTestZKAndFSPermissions extends AbstractHBaseTool { private void assertZnodePerms(RecoverableZooKeeper zk, String znode, boolean expectedWorldReadable) throws KeeperException, InterruptedException { Stat stat = new Stat(); - List<ACL> acls = zk.getZooKeeper().getACL(znode, stat); + List<ACL> acls; + try { + acls = zk.getZooKeeper().getACL(znode, stat); + } catch (NoNodeException ex) { + LOG.debug("Caught exception for missing znode", ex); + // the znode is deleted. Probably it was a temporary znode (like RIT). + return; + } String[] superUsers = superUser == null ? null : superUser.split(","); LOG.info("Checking ACLs for znode znode:" + znode + " acls:" + acls);
