Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
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...
commit 0e728061bec5a184cdd64b9fd4847717d951f715 1 parent 91843ac
Alex Feinberg authored
View
BIN  lib/zookeeper-3.3.1.jar
Binary file not shown
View
BIN  lib/zookeeper-3.4.3.jar
Binary file not shown
View
10 src/contrib/highavailability/src/test/org/apache/hadoop/hdfs/MiniAvatarCluster.java
@@ -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);
}
Please sign in to comment.
Something went wrong with that request. Please try again.