Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-5775 ZKUtil doesn't handle deleteRecurisively cleanly (Jesse Yates) 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1325540 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
larsh 2012-04-12 21:53:54 +00:00
parent eb5d2fe9d0
commit fc9faf8585
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java
View File

@ -1004,7 +1004,9 @@ public class ZKUtil {
/** /**
* Delete the specified node and all of it's children. * Delete the specified node and all of it's children.
* * <p>
* If the node does not exist, just returns.
* <p>
* Sets no watches. Throws all exceptions besides dealing with deletion of * Sets no watches. Throws all exceptions besides dealing with deletion of
* children. * children.
*/ */
@ -1012,6 +1014,9 @@ public class ZKUtil {
throws KeeperException { throws KeeperException {
try { try {
List<String> children = ZKUtil.listChildrenNoWatch(zkw, node); List<String> children = ZKUtil.listChildrenNoWatch(zkw, node);
// the node is already deleted, so we just finish
if (children == null) return;
if(!children.isEmpty()) { if(!children.isEmpty()) {
for(String child : children) { for(String child : children) {
deleteNodeRecursively(zkw, joinZNode(node, child)); deleteNodeRecursively(zkw, joinZNode(node, child));

5
src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
View File

@ -279,7 +279,12 @@ public class TestZooKeeper {
assertNotNull(ZKUtil.getDataNoWatch(zkw, "/l1/l2/l3/l4", null)); assertNotNull(ZKUtil.getDataNoWatch(zkw, "/l1/l2/l3/l4", null));
} }
ZKUtil.deleteNodeRecursively(zkw, "/l1/l2"); ZKUtil.deleteNodeRecursively(zkw, "/l1/l2");
// make sure it really is deleted
assertNull(ZKUtil.getDataNoWatch(zkw, "/l1/l2/l3/l4", null)); assertNull(ZKUtil.getDataNoWatch(zkw, "/l1/l2/l3/l4", null));
// do the same delete again and make sure it doesn't crash
ZKUtil.deleteNodeRecursively(zkw, "/l1/l2");
ZKUtil.deleteNode(zkw, "/l1"); ZKUtil.deleteNode(zkw, "/l1");
assertNull(ZKUtil.getDataNoWatch(zkw, "/l1/l2", null)); assertNull(ZKUtil.getDataNoWatch(zkw, "/l1/l2", null));
} }