Permalink
Browse files

Upgrade ZooKeeper to 3.4.3

Summary:
Upgrade ZooKeeper to 3.4.3 for bug fixes and compatibility with
BookKeeper.  This revision updates the ZooKeeper charge and modifies
MiniAvatarCluster to use new classnames for started the embedded
ZooKeeper server.

Test Plan:
Compile and run all unit tests for high-availability module Verify
that we can connect to and communicate with existing ZooKeeper
clusters that may use an older version of ZooKeeper.

Revert Plan:

Reviewers: hkuang, tomasz
  • Loading branch information...
1 parent 91843ac commit 0e728061bec5a184cdd64b9fd4847717d951f715 Alex Feinberg committed Nov 8, 2012
View
Binary file not shown.
View
Binary file not shown.
@@ -29,10 +29,10 @@
import junit.framework.Assert;
+import org.apache.zookeeper.server.NIOServerCnxnFactory;
import org.apache.zookeeper.server.ZooKeeperServer;
import org.apache.zookeeper.server.quorum.QuorumPeerConfig.ConfigException;
import org.apache.zookeeper.server.persistence.FileTxnSnapLog;
-import org.apache.zookeeper.server.NIOServerCnxn;
import org.apache.zookeeper.server.ServerConfig;
import org.apache.commons.logging.Log;
@@ -310,7 +310,7 @@ public void cleanupAvatarDirs() throws IOException {
}
private static ZooKeeperServer zooKeeper;
- private static NIOServerCnxn.Factory cnxnFactory;
+ private static NIOServerCnxnFactory cnxnFactory;
private ArrayList<DataNodeProperties> dataNodes =
new ArrayList<DataNodeProperties>();
@@ -524,9 +524,9 @@ public static void createAndStartZooKeeper()
zooKeeper.setMinSessionTimeout(zkConf.getMinSessionTimeout());
zooKeeper.setMaxSessionTimeout(zkConf.getMaxSessionTimeout());
- cnxnFactory =
- new NIOServerCnxn.Factory(zkConf.getClientPortAddress(),
- zkConf.getMaxClientCnxns());
+ cnxnFactory = new NIOServerCnxnFactory();
+ cnxnFactory.configure(zkConf.getClientPortAddress(),
+ zkConf.getMaxClientCnxns());
cnxnFactory.startup(zooKeeper);
}

0 comments on commit 0e72806

Please sign in to comment.