Skip to content
This repository has been archived by the owner on Jan 13, 2022. It is now read-only.

Commit

Permalink
Upgrade ZooKeeper to 3.4.3
Browse files Browse the repository at this point in the history
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
Alex Feinberg committed Nov 8, 2012
1 parent 91843ac commit 0e72806
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
Binary file removed lib/zookeeper-3.3.1.jar
Binary file not shown.
Binary file added lib/zookeeper-3.4.3.jar
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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>();
Expand Down Expand Up @@ -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);

}
Expand Down

0 comments on commit 0e72806

Please sign in to comment.