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 2016/11/15 21:31:48 UTC

[1/4] hbase git commit: HBASE-17091 IntegrationTestZKAndFSPermissions failed with 'KeeperException'

Repository: hbase
Updated Branches:
  refs/heads/branch-1 e54826434 -> bf0483c37
  refs/heads/branch-1.1 a268d4cf5 -> a8628ee9a
  refs/heads/branch-1.2 c1701571d -> e7b310e68
  refs/heads/master 8847a7090 -> d40a0c3bd


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/d40a0c3b
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d40a0c3b
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d40a0c3b

Branch: refs/heads/master
Commit: d40a0c3bd88b7098437050eeb3e3f5c6ef5f5502
Parents: 8847a70
Author: Enis Soztutar <en...@apache.org>
Authored: Tue Nov 15 13:09:25 2016 -0800
Committer: Enis Soztutar <en...@apache.org>
Committed: Tue Nov 15 13:09:25 2016 -0800

----------------------------------------------------------------------
 .../hbase/test/IntegrationTestZKAndFSPermissions.java   | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/d40a0c3b/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 9d30b7c..0d85e42 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);


[4/4] hbase git commit: HBASE-17091 IntegrationTestZKAndFSPermissions failed with 'KeeperException'

Posted by en...@apache.org.
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/a8628ee9
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a8628ee9
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a8628ee9

Branch: refs/heads/branch-1.1
Commit: a8628ee9a2c3e32347cf091db3bb3d67789fd29a
Parents: a268d4c
Author: Enis Soztutar <en...@apache.org>
Authored: Tue Nov 15 13:09:25 2016 -0800
Committer: Enis Soztutar <en...@apache.org>
Committed: Tue Nov 15 13:31:32 2016 -0800

----------------------------------------------------------------------
 .../hbase/test/IntegrationTestZKAndFSPermissions.java   | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/a8628ee9/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 c39056d..2d8ef89 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;
+    }
 
     LOG.info("Checking ACLs for znode znode:" + znode + " acls:" + acls);
 


[3/4] hbase git commit: HBASE-17091 IntegrationTestZKAndFSPermissions failed with 'KeeperException'

Posted by en...@apache.org.
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/e7b310e6
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e7b310e6
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e7b310e6

Branch: refs/heads/branch-1.2
Commit: e7b310e687fd65e1c7f79d02667379602a8895a9
Parents: c170157
Author: Enis Soztutar <en...@apache.org>
Authored: Tue Nov 15 13:09:25 2016 -0800
Committer: Enis Soztutar <en...@apache.org>
Committed: Tue Nov 15 13:12:03 2016 -0800

----------------------------------------------------------------------
 .../hbase/test/IntegrationTestZKAndFSPermissions.java   | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/e7b310e6/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);


[2/4] hbase git commit: HBASE-17091 IntegrationTestZKAndFSPermissions failed with 'KeeperException'

Posted by en...@apache.org.
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/bf0483c3
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/bf0483c3
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/bf0483c3

Branch: refs/heads/branch-1
Commit: bf0483c37c09842f72dcea08042f8dadc0f0b758
Parents: e548264
Author: Enis Soztutar <en...@apache.org>
Authored: Tue Nov 15 13:09:25 2016 -0800
Committer: Enis Soztutar <en...@apache.org>
Committed: Tue Nov 15 13:09:32 2016 -0800

----------------------------------------------------------------------
 .../hbase/test/IntegrationTestZKAndFSPermissions.java   | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/bf0483c3/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);