You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by je...@apache.org on 2014/02/25 02:30:52 UTC

svn commit: r1571519 - /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ZKDataMigrator.java

Author: jeffreyz
Date: Tue Feb 25 01:30:51 2014
New Revision: 1571519

URL: http://svn.apache.org/r1571519
Log:
HBASE-10581: ACL znode are left without PBed during upgrading hbase0.94* to hbase0.96+

Modified:
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ZKDataMigrator.java

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ZKDataMigrator.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ZKDataMigrator.java?rev=1571519&r1=1571518&r2=1571519&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ZKDataMigrator.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ZKDataMigrator.java Tue Feb 25 01:30:51 2014
@@ -118,6 +118,9 @@ public class ZKDataMigrator extends Conf
         } 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) {