You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by iv...@apache.org on 2012/03/28 23:57:40 UTC

svn commit: r1306616 - in /zookeeper/bookkeeper/trunk: CHANGES.txt bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/HierarchicalLedgerManager.java

Author: ivank
Date: Wed Mar 28 21:57:40 2012
New Revision: 1306616

URL: http://svn.apache.org/viewvc?rev=1306616&view=rev
Log:
BOOKKEEPER-195: HierarchicalLedgerManager doesn't consider idgen as a "specialNode" (ivank)

Modified:
    zookeeper/bookkeeper/trunk/CHANGES.txt
    zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/HierarchicalLedgerManager.java

Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1306616&r1=1306615&r2=1306616&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Wed Mar 28 21:57:40 2012
@@ -62,6 +62,8 @@ Trunk (unreleased changes)
 
         BOOKKEEPER-189: AbstractZkLedgerManager doesn't disregard cookies (ivank via sijie)
 
+        BOOKKEEPER-195: HierarchicalLedgerManager doesn't consider idgen as a "specialNode" (ivank)
+
       hedwig-server/
       
         BOOKKEEPER-140: Hub server doesn't subscribe remote region correctly when a region is down. (Sijie Gou via ivank)

Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/HierarchicalLedgerManager.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/HierarchicalLedgerManager.java?rev=1306616&r1=1306615&r2=1306616&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/HierarchicalLedgerManager.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/HierarchicalLedgerManager.java Wed Mar 28 21:57:40 2012
@@ -84,7 +84,8 @@ class HierarchicalLedgerManager extends 
 
     public static final int CUR_VERSION = 1;
 
-    static final String IDGENERATION_PREFIX = "/idgen/ID-";
+    static final String IDGEN_ZNODE = "idgen";
+    static final String IDGENERATION_PREFIX = "/" + IDGEN_ZNODE + "/ID-";
     private static final String MAX_ID_SUFFIX = "9999";
     private static final String MIN_ID_SUFFIX = "0000";
 
@@ -514,4 +515,9 @@ class HierarchicalLedgerManager extends 
             processor.process(firstElement, stubCallback);
         }
     }
+
+    @Override
+    protected boolean isSpecialZnode(String znode) {
+        return IDGEN_ZNODE.equals(znode) || super.isSpecialZnode(znode);
+    }
 }