From 3fe9d15c1861a465e7b715ed8ac2640b99c55bd4 Mon Sep 17 00:00:00 2001
From: jeffreyz <jeffreyz@unknown>
Date: Tue, 25 Feb 2014 01:30:51 +0000
Subject: [PATCH] HBASE-10581: ACL znode are left without PBed during upgrading
 hbase0.94* to hbase0.96+

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1571519 13f79535-47bb-0310-9956-ffa450edef68
---
 .../main/java/org/apache/hadoop/hbase/util/ZKDataMigrator.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ZKDataMigrator.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ZKDataMigrator.java
index 8b813a7d2bd..f773b06f503 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ZKDataMigrator.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ZKDataMigrator.java
@@ -118,6 +118,9 @@ public class ZKDataMigrator extends Configured implements Tool {
         } else if (child.equals(SnapshotManager.ONLINE_SNAPSHOT_CONTROLLER_DESCRIPTION)) {
           // not needed as it is transient.
           ZKUtil.deleteNodeRecursively(zkw, childPath);
+        } else if (child.equals(conf.get("zookeeper.znode.acl.parent", "acl"))) {
+          // it will be re-created when hbase:acl is re-opened
+          ZKUtil.deleteNodeRecursively(zkw, childPath);
         }
       }
     } catch (Exception e) {