HBASE-2392 Upgrade to ZooKeeper 3.3.0

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@929320 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -17,6 +17,7 @@ Release 0.21.0 - Unreleased
    HBASE-2255  take trunk back to hadoop 0.20
    HBASE-2378  Bulk insert with multiple reducers broken due to improper
                ImmutableBytesWritable comparator (Todd Lipcon via Stack)
+   HBASE-2392  Upgrade to ZooKeeper 3.3.0
 
   BUG FIXES
    HBASE-1791  Timeout in IndexRecordWriter (Bradford Stephens via Andrew

core/pom.xml

@@ -230,7 +230,7 @@
       <version>${thrift.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop.zookeeper</groupId>
+      <groupId>org.apache.hadoop</groupId>
       <artifactId>zookeeper</artifactId>
       <version>${zookeeper.version}</version>
     </dependency>

core/src/main/java/org/apache/hadoop/hbase/MiniZooKeeperCluster.java

@@ -26,6 +26,7 @@ import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.Reader;
 import java.net.BindException;
+import java.net.InetSocketAddress;
 import java.net.Socket;
 
 import org.apache.commons.logging.Log;
@@ -100,7 +101,8 @@ public class MiniZooKeeperCluster {
     ZooKeeperServer server = new ZooKeeperServer(dir, dir, tickTimeToUse);
     while (true) {
       try {
-        standaloneServerFactory = new NIOServerCnxn.Factory(clientPort);
+        standaloneServerFactory =
+          new NIOServerCnxn.Factory(new InetSocketAddress(clientPort));
       } catch (BindException e) {
         LOG.info("Faild binding ZK Server to client port: " + clientPort);
         //this port is already in use. try to use another

core/src/main/resources/hbase-default.xml

@@ -419,10 +419,7 @@
       HBase passes this to the zk quorum as suggested maximum time for a
       session.  See http://hadoop.apache.org/zookeeper/docs/current/zookeeperProgrammers.html#ch_zkSessions
       "The client sends a requested timeout, the server responds with the
-      timeout that it can give the client. The current implementation
-      requires that the timeout be a minimum of 2 times the tickTime
-      (as set in the server configuration) and a maximum of 20 times
-      the tickTime." Set the zk ticktime with hbase.zookeeper.property.tickTime.
+      timeout that it can give the client. "
       In milliseconds.
     </description>
   </property>
@@ -504,29 +501,6 @@
       <value>10</value>
     </property>
   -->
-  <property>
-    <name>hbase.zookeeper.property.tickTime</name>
-    <value>3000</value>
-    <description>Property from ZooKeeper's config zoo.cfg.
-    The number of milliseconds of each tick.  See
-    zookeeper.session.timeout description.
-    </description>
-  </property>
-  <property>
-    <name>hbase.zookeeper.property.initLimit</name>
-    <value>10</value>
-    <description>Property from ZooKeeper's config zoo.cfg.
-    The number of ticks that the initial synchronization phase can take.
-    </description>
-  </property>
-  <property>
-    <name>hbase.zookeeper.property.syncLimit</name>
-    <value>5</value>
-    <description>Property from ZooKeeper's config zoo.cfg.
-    The number of ticks that can pass between sending a request and getting an
-    acknowledgment.
-    </description>
-  </property>
   <property>
     <name>hbase.zookeeper.property.dataDir</name>
     <value>${hbase.tmp.dir}/zookeeper</value>

core/src/test/java/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java

@@ -119,7 +119,7 @@ public class TestHQuorumPeer extends HBaseTestCase {
     int syncLimit = config.getSyncLimit();
     assertEquals(5, syncLimit);
     assertEquals(dataDir.toString(), config.getDataDir());
-    assertEquals(2181, config.getClientPort());
+    assertEquals(2181, config.getClientPortAddress().getPort());
     Map<Long,QuorumServer> servers = config.getServers();
     assertEquals(1, servers.size());
     assertTrue(servers.containsKey(Long.valueOf(0)));

pom.xml

@@ -166,8 +166,8 @@
     <commons-lang.version>2.4</commons-lang.version>
     <commons-math.version>2.0</commons-math.version>
     <commons-cli.version>1.2</commons-cli.version>
-    <!-- TODO specify external repositories - Note the following 2 resources are not downloadable from a public repository, you'll need to place these manually by using 'mvn install:file' or use something like Nexus as a repository manager -->
-    <zookeeper.version>3.2.2</zookeeper.version>
+    <zookeeper.version>3.3.0</zookeeper.version>
+    <!-- TODO specify external repositories - Note the following 1 resource (thrift) is not downloadable from a public repository, you'll need to place this manually by using 'mvn install:file' or use something like Nexus as a repository manager -->
     <thrift.version>0.2.0</thrift.version>
     <jruby.version>1.4.0</jruby.version>
     <slf4j.version>1.5.8</slf4j.version>
@@ -219,6 +219,17 @@
         <enabled>true</enabled>
       </releases>
     </repository>
+    <repository>
+      <id>ibiblio.org</id>
+      <name>ibiblio mirror</name>
+      <url>http://mirrors.ibiblio.org/pub/mirrors/maven2/</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </repository>
   </repositories>
 
   <build>