hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apurt...@apache.org
Subject svn commit: r929323 - in /hadoop/hbase/branches/0.20: ./ conf/ lib/ src/contrib/ec2/bin/ src/java/org/apache/hadoop/hbase/ src/test/org/apache/hadoop/hbase/zookeeper/
Date Tue, 30 Mar 2010 22:44:53 GMT
Author: apurtell
Date: Tue Mar 30 22:44:53 2010
New Revision: 929323

URL: http://svn.apache.org/viewvc?rev=929323&view=rev
Log:
HBASE-2392 Upgrade to ZooKeeper 3.3.0

Added:
    hadoop/hbase/branches/0.20/lib/zookeeper-3.3.0.jar   (with props)
Removed:
    hadoop/hbase/branches/0.20/lib/zookeeper-3.2.2.jar
Modified:
    hadoop/hbase/branches/0.20/CHANGES.txt
    hadoop/hbase/branches/0.20/conf/hbase-default.xml
    hadoop/hbase/branches/0.20/src/contrib/ec2/bin/hbase-ec2-init-remote.sh
    hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/MiniZooKeeperCluster.java
    hadoop/hbase/branches/0.20/src/test/org/apache/hadoop/hbase/zookeeper/HQuorumPeerTest.java

Modified: hadoop/hbase/branches/0.20/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/CHANGES.txt?rev=929323&r1=929322&r2=929323&view=diff
==============================================================================
--- hadoop/hbase/branches/0.20/CHANGES.txt (original)
+++ hadoop/hbase/branches/0.20/CHANGES.txt Tue Mar 30 22:44:53 2010
@@ -7,6 +7,7 @@ Release 0.20.4 - Unreleased
    HBASE-2066  Perf: parallelize puts
    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-2173  New idx javadoc not included with the rest

Modified: hadoop/hbase/branches/0.20/conf/hbase-default.xml
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/conf/hbase-default.xml?rev=929323&r1=929322&r2=929323&view=diff
==============================================================================
--- hadoop/hbase/branches/0.20/conf/hbase-default.xml (original)
+++ hadoop/hbase/branches/0.20/conf/hbase-default.xml Tue Mar 30 22:44:53 2010
@@ -399,10 +399,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>
@@ -496,29 +493,6 @@
     </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>
     <description>Property from ZooKeeper's config zoo.cfg.

Added: hadoop/hbase/branches/0.20/lib/zookeeper-3.3.0.jar
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/lib/zookeeper-3.3.0.jar?rev=929323&view=auto
==============================================================================
Binary file - no diff available.

Propchange: hadoop/hbase/branches/0.20/lib/zookeeper-3.3.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: hadoop/hbase/branches/0.20/src/contrib/ec2/bin/hbase-ec2-init-remote.sh
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/src/contrib/ec2/bin/hbase-ec2-init-remote.sh?rev=929323&r1=929322&r2=929323&view=diff
==============================================================================
--- hadoop/hbase/branches/0.20/src/contrib/ec2/bin/hbase-ec2-init-remote.sh (original)
+++ hadoop/hbase/branches/0.20/src/contrib/ec2/bin/hbase-ec2-init-remote.sh Tue Mar 30 22:44:53
2010
@@ -188,7 +188,7 @@ export HADOOP_NAMENODE_OPTS="$HADOOP_NAM
 EOF
 # Update classpath to include HBase jars and config
 cat >> $HADOOP_HOME/conf/hadoop-env.sh <<EOF
-export HADOOP_CLASSPATH="$HBASE_HOME/hbase-${HBASE_VERSION}.jar:$HBASE_HOME/lib/AgileJSON-2009-03-30.jar:$HBASE_HOME/lib/json.jar:$HBASE_HOME/lib/zookeeper-3.2.2.jar:$HBASE_HOME/conf"
+export HADOOP_CLASSPATH="$HBASE_HOME/hbase-${HBASE_VERSION}.jar:$HBASE_HOME/lib/AgileJSON-2009-03-30.jar:$HBASE_HOME/lib/json.jar:$HBASE_HOME/lib/zookeeper-3.3.0.jar:$HBASE_HOME/conf"
 EOF
 # Configure Hadoop for Ganglia
 cat > $HADOOP_HOME/conf/hadoop-metrics.properties <<EOF

Modified: hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/MiniZooKeeperCluster.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/MiniZooKeeperCluster.java?rev=929323&r1=929322&r2=929323&view=diff
==============================================================================
--- hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/MiniZooKeeperCluster.java
(original)
+++ hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/MiniZooKeeperCluster.java
Tue Mar 30 22:44:53 2010
@@ -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;
@@ -101,7 +102,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

Modified: hadoop/hbase/branches/0.20/src/test/org/apache/hadoop/hbase/zookeeper/HQuorumPeerTest.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/src/test/org/apache/hadoop/hbase/zookeeper/HQuorumPeerTest.java?rev=929323&r1=929322&r2=929323&view=diff
==============================================================================
--- hadoop/hbase/branches/0.20/src/test/org/apache/hadoop/hbase/zookeeper/HQuorumPeerTest.java
(original)
+++ hadoop/hbase/branches/0.20/src/test/org/apache/hadoop/hbase/zookeeper/HQuorumPeerTest.java
Tue Mar 30 22:44:53 2010
@@ -117,7 +117,7 @@ public class HQuorumPeerTest extends HBa
     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)));



Mime
View raw message