hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jeffr...@apache.org
Subject svn commit: r1571523 - /hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ZKDataMigrator.java
Date Tue, 25 Feb 2014 01:39:23 GMT
Author: jeffreyz
Date: Tue Feb 25 01:39:22 2014
New Revision: 1571523

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

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

Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ZKDataMigrator.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ZKDataMigrator.java?rev=1571523&r1=1571522&r2=1571523&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ZKDataMigrator.java
(original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ZKDataMigrator.java
Tue Feb 25 01:39:22 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) {



Mime
View raw message