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/04/28 11:11:28 UTC
svn commit: r1331720 - in /zookeeper/bookkeeper/trunk: CHANGES.txt
bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ZooKeeperUtil.java
Author: sijie
Date: Sat Apr 28 09:11:28 2012
New Revision: 1331720
URL: http://svn.apache.org/viewvc?rev=1331720&view=rev
Log:
BOOKKEEPER-231: ZKUtil.killServer not closing the FileTxnSnapLog from ZK. (Uma Maheswara Rao G via sijie)
Modified:
zookeeper/bookkeeper/trunk/CHANGES.txt
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ZooKeeperUtil.java
Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1331720&r1=1331719&r2=1331720&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Sat Apr 28 09:11:28 2012
@@ -90,6 +90,8 @@ Trunk (unreleased changes)
BOOKKEEPER-213: PerChannelBookieClient calls the wrong errorOut function when encountering an exception (Aniruddha via sijie)
+ BOOKKEEPER-231: ZKUtil.killServer not closing the FileTxnSnapLog from ZK. (Uma Maheswara Rao G via sijie)
+
hedwig-client/
BOOKKEEPER-217: NPE in hedwig client when enable DEBUG (sijie via ivank)
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ZooKeeperUtil.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ZooKeeperUtil.java?rev=1331720&r1=1331719&r2=1331720&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ZooKeeperUtil.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ZooKeeperUtil.java Sat Apr 28 09:11:28 2012
@@ -127,6 +127,9 @@ public class ZooKeeperUtil {
ClientBase.waitForServerDown(getZooKeeperConnectString(),
ClientBase.CONNECTION_TIMEOUT));
}
+ if (zks != null) {
+ zks.getTxnLogFactory().close();
+ }
// ServerStats.unregister();
FileUtils.deleteDirectory(ZkTmpDir);
}