You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by si...@apache.org on 2012/03/21 06:40:55 UTC
svn commit: r1303291 - in /zookeeper/bookkeeper/trunk: CHANGES.txt
bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/AbstractZkLedgerManager.java
bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/HierarchicalLedgerManager.java
Author: sijie
Date: Wed Mar 21 05:40:55 2012
New Revision: 1303291
URL: http://svn.apache.org/viewvc?rev=1303291&view=rev
Log:
BOOKKEEPER-189: AbstractZkLedgerManager doesn't disregard cookies (ivank via sijie)
Modified:
zookeeper/bookkeeper/trunk/CHANGES.txt
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/AbstractZkLedgerManager.java
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=1303291&r1=1303290&r2=1303291&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Wed Mar 21 05:40:55 2012
@@ -60,6 +60,8 @@ Trunk (unreleased changes)
BOOKKEEPER-186: Bookkeeper throttling - permits is not released when read has failed from all replicas (Rakesh R via sijie)
+ BOOKKEEPER-189: AbstractZkLedgerManager doesn't disregard cookies (ivank via sijie)
+
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/AbstractZkLedgerManager.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/AbstractZkLedgerManager.java?rev=1303291&r1=1303290&r2=1303291&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/AbstractZkLedgerManager.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/AbstractZkLedgerManager.java Wed Mar 21 05:40:55 2012
@@ -45,6 +45,7 @@ abstract class AbstractZkLedgerManager i
// Ledger Node Prefix
static public final String LEDGER_NODE_PREFIX = "L";
static final String AVAILABLE_NODE = "available";
+ static final String COOKIES_NODE = "cookies";
protected final AbstractConfiguration conf;
protected final ZooKeeper zk;
@@ -240,7 +241,8 @@ abstract class AbstractZkLedgerManager i
* @return true if the znode is a special znode otherwise false
*/
protected boolean isSpecialZnode(String znode) {
- if (AVAILABLE_NODE.equals(znode)
+ if (AVAILABLE_NODE.equals(znode)
+ || COOKIES_NODE.equals(znode)
|| LedgerLayout.LAYOUT_ZNODE.equals(znode)) {
return true;
}
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=1303291&r1=1303290&r2=1303291&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 21 05:40:55 2012
@@ -377,11 +377,11 @@ class HierarchicalLedgerManager extends
}
} catch (Exception e) {
LOG.warn("Exception during garbage collecting ledgers for " + l1Node
- + " of " + ledgerRootPath);
+ + " of " + ledgerRootPath, e);
}
}
} catch (Exception e) {
- LOG.warn("Exception during garbage collecting inactive/deleted ledgers");
+ LOG.warn("Exception during garbage collecting inactive/deleted ledgers", e);
}
}