diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java index 64f75c479eb..b5b6bd66bc8 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java @@ -26,6 +26,7 @@ import java.net.InetSocketAddress; import java.net.Socket; import java.util.ArrayList; import java.util.Arrays; +import java.util.Deque; import java.util.HashMap; import java.util.LinkedList; import java.util.List; @@ -1347,14 +1348,106 @@ public class ZKUtil { * * Sets no watches. Throws all exceptions besides dealing with deletion of * children. + * + * If hbase.zookeeper.useMulti is true, use ZooKeeper's multi-update functionality. + * Otherwise, run the list of operations sequentially. + * + * @throws KeeperException */ public static void deleteChildrenRecursively(ZooKeeperWatcher zkw, String node) - throws KeeperException { - List children = ZKUtil.listChildrenNoWatch(zkw, node); - if (children == null || children.isEmpty()) return; - for(String child : children) { - deleteNodeRecursively(zkw, joinZNode(node, child)); + throws KeeperException { + deleteChildrenRecursivelyMultiOrSequential(zkw, true, node); + } + + /** + * Delete all the children of the specified node but not the node itself. This + * will first traverse the znode tree for listing the children and then delete + * these znodes using multi-update api or sequential based on the specified + * configurations. + *

+ * Sets no watches. Throws all exceptions besides dealing with deletion of + * children. + *

+ * If hbase.zookeeper.useMulti is true, use ZooKeeper's multi-update + * functionality. Otherwise, run the list of operations sequentially. + *

+ * If all of the following are true: + *

+ * on calling multi, we get a ZooKeeper exception that can be handled by a + * sequential call(*), we retry the operations one-by-one (sequentially). + * + * @param zkw + * - zk reference + * @param runSequentialOnMultiFailure + * - if true when we get a ZooKeeper exception that could retry the + * operations one-by-one (sequentially) + * @param pathRoots + * - path of the parent node(s) + * @throws KeeperException.NotEmptyException + * if node has children while deleting + * @throws KeeperException + * if unexpected ZooKeeper exception + * @throws IllegalArgumentException + * if an invalid path is specified + */ + public static void deleteChildrenRecursivelyMultiOrSequential( + ZooKeeperWatcher zkw, boolean runSequentialOnMultiFailure, + String... pathRoots) throws KeeperException { + if (pathRoots == null || pathRoots.length <= 0) { + LOG.warn("Given path is not valid!"); + return; } + List ops = new ArrayList(); + for (String eachRoot : pathRoots) { + List children = listChildrenBFSNoWatch(zkw, eachRoot); + // Delete the leaves first and eventually get rid of the root + for (int i = children.size() - 1; i >= 0; --i) { + ops.add(ZKUtilOp.deleteNodeFailSilent(children.get(i))); + } + } + // atleast one element should exist + if (ops.size() > 0) { + multiOrSequential(zkw, ops, runSequentialOnMultiFailure); + } + } + + /** + * BFS Traversal of all the children under path, with the entries in the list, + * in the same order as that of the traversal. Lists all the children without + * setting any watches. + * + * @param zkw + * - zk reference + * @param znode + * - path of node + * @return list of children znodes under the path + * @throws KeeperException + * if unexpected ZooKeeper exception + */ + private static List listChildrenBFSNoWatch(ZooKeeperWatcher zkw, + final String znode) throws KeeperException { + Deque queue = new LinkedList(); + List tree = new ArrayList(); + queue.add(znode); + while (true) { + String node = queue.pollFirst(); + if (node == null) { + break; + } + List children = listChildrenNoWatch(zkw, node); + if (children == null) { + continue; + } + for (final String child : children) { + final String childPath = node + "/" + child; + queue.add(childPath); + tree.add(childPath); + } + } + return tree; } /** diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKMulti.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKMulti.java index db4c2fa1af0..b4b1f9b6676 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKMulti.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKMulti.java @@ -24,7 +24,9 @@ package org.apache.hadoop.hbase.zookeeper; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import java.util.ArrayList; import java.util.LinkedList; +import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -35,7 +37,10 @@ import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.zookeeper.ZKUtil.ZKUtilOp; +import org.apache.zookeeper.CreateMode; import org.apache.zookeeper.KeeperException; +import org.apache.zookeeper.Op; +import org.apache.zookeeper.ZooDefs.Ids; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -75,7 +80,7 @@ public class TestZKMulti { TEST_UTIL.shutdownMiniZKCluster(); } - @Test + @Test (timeout=60000) public void testSimpleMulti() throws Exception { // null multi ZKUtil.multiOrSequential(zkw, null, false); @@ -104,7 +109,7 @@ public class TestZKMulti { assertTrue(ZKUtil.checkExists(zkw, path) == -1); } - @Test + @Test (timeout=60000) public void testComplexMulti() throws Exception { String path1 = ZKUtil.joinZNode(zkw.baseZNode, "testComplexMulti1"); String path2 = ZKUtil.joinZNode(zkw.baseZNode, "testComplexMulti2"); @@ -146,7 +151,7 @@ public class TestZKMulti { assertTrue(Bytes.equals(ZKUtil.getData(zkw, path6), Bytes.toBytes(path6))); } - @Test + @Test (timeout=60000) public void testSingleFailure() throws Exception { // try to delete a node that doesn't exist boolean caughtNoNode = false; @@ -184,7 +189,7 @@ public class TestZKMulti { assertTrue(caughtNodeExists); } - @Test + @Test (timeout=60000) public void testSingleFailureInMulti() throws Exception { // try a multi where all but one operation succeeds String pathA = ZKUtil.joinZNode(zkw.baseZNode, "testSingleFailureInMultiA"); @@ -207,7 +212,7 @@ public class TestZKMulti { assertTrue(ZKUtil.checkExists(zkw, pathC) == -1); } - @Test + @Test (timeout=60000) public void testMultiFailure() throws Exception { String pathX = ZKUtil.joinZNode(zkw.baseZNode, "testMultiFailureX"); String pathY = ZKUtil.joinZNode(zkw.baseZNode, "testMultiFailureY"); @@ -261,7 +266,7 @@ public class TestZKMulti { assertTrue(ZKUtil.checkExists(zkw, pathV) == -1); } - @Test + @Test (timeout=60000) public void testRunSequentialOnMultiFailure() throws Exception { String path1 = ZKUtil.joinZNode(zkw.baseZNode, "runSequential1"); String path2 = ZKUtil.joinZNode(zkw.baseZNode, "runSequential2"); @@ -289,4 +294,72 @@ public class TestZKMulti { assertTrue(ZKUtil.checkExists(zkw, path3) == -1); assertFalse(ZKUtil.checkExists(zkw, path4) == -1); } + + /** + * Verifies that for the given root node, it should delete all the child nodes + * recursively using multi-update api. + */ + @Test (timeout=60000) + public void testdeleteChildrenRecursivelyMulti() throws Exception { + String parentZNode = "/testRootMulti"; + createZNodeTree(parentZNode); + + ZKUtil.deleteChildrenRecursivelyMultiOrSequential(zkw, true, parentZNode); + + assertTrue("Wrongly deleted parent znode!", + ZKUtil.checkExists(zkw, parentZNode) > -1); + List children = zkw.getRecoverableZooKeeper().getChildren( + parentZNode, false); + assertTrue("Failed to delete child znodes!", 0 == children.size()); + } + + /** + * Verifies that for the given root node, it should delete all the child nodes + * recursively using normal sequential way. + */ + @Test (timeout=60000) + public void testdeleteChildrenRecursivelySequential() throws Exception { + String parentZNode = "/testRootSeq"; + createZNodeTree(parentZNode); + boolean useMulti = zkw.getConfiguration().getBoolean( + "hbase.zookeeper.useMulti", false); + zkw.getConfiguration().setBoolean("hbase.zookeeper.useMulti", false); + try { + // disables the multi-update api execution + ZKUtil.deleteChildrenRecursivelyMultiOrSequential(zkw, true, parentZNode); + + assertTrue("Wrongly deleted parent znode!", + ZKUtil.checkExists(zkw, parentZNode) > -1); + List children = zkw.getRecoverableZooKeeper().getChildren( + parentZNode, false); + assertTrue("Failed to delete child znodes!", 0 == children.size()); + } finally { + // sets back the multi-update api execution + zkw.getConfiguration().setBoolean("hbase.zookeeper.useMulti", useMulti); + } + } + + private void createZNodeTree(String rootZNode) throws KeeperException, + InterruptedException { + List opList = new ArrayList(); + opList.add(Op.create(rootZNode, new byte[0], Ids.OPEN_ACL_UNSAFE, + CreateMode.PERSISTENT)); + int level = 0; + String parentZNode = rootZNode; + while (level < 10) { + // define parent node + parentZNode = parentZNode + "/" + level; + opList.add(Op.create(parentZNode, new byte[0], Ids.OPEN_ACL_UNSAFE, + CreateMode.PERSISTENT)); + int elements = 0; + // add elements to the parent node + while (elements < level) { + opList.add(Op.create(parentZNode + "/" + elements, new byte[0], + Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT)); + elements++; + } + level++; + } + zkw.getRecoverableZooKeeper().multi(opList); + } }