Return-Path: Delivered-To: apmail-hadoop-hbase-commits-archive@minotaur.apache.org Received: (qmail 1070 invoked from network); 15 Mar 2010 18:16:30 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 15 Mar 2010 18:16:30 -0000 Received: (qmail 78522 invoked by uid 500); 15 Mar 2010 18:15:43 -0000 Delivered-To: apmail-hadoop-hbase-commits-archive@hadoop.apache.org Received: (qmail 78451 invoked by uid 500); 15 Mar 2010 18:15:43 -0000 Mailing-List: contact hbase-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hbase-dev@hadoop.apache.org Delivered-To: mailing list hbase-commits@hadoop.apache.org Received: (qmail 78444 invoked by uid 99); 15 Mar 2010 18:15:43 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Mar 2010 18:15:43 +0000 X-ASF-Spam-Status: No, hits=-1018.8 required=10.0 tests=ALL_TRUSTED,AWL X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Mar 2010 18:15:42 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6907A23889B3; Mon, 15 Mar 2010 18:15:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r923370 - in /hadoop/hbase/branches/0.20: CHANGES.txt src/java/org/apache/hadoop/hbase/HConstants.java src/java/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.java Date: Mon, 15 Mar 2010 18:15:22 -0000 To: hbase-commits@hadoop.apache.org From: stack@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100315181522.6907A23889B3@eris.apache.org> Author: stack Date: Mon Mar 15 18:15:22 2010 New Revision: 923370 URL: http://svn.apache.org/viewvc?rev=923370&view=rev Log: HBASE-2305 Client port for ZK has no default Modified: hadoop/hbase/branches/0.20/CHANGES.txt hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/HConstants.java hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.java Modified: hadoop/hbase/branches/0.20/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/CHANGES.txt?rev=923370&r1=923369&r2=923370&view=diff ============================================================================== --- hadoop/hbase/branches/0.20/CHANGES.txt (original) +++ hadoop/hbase/branches/0.20/CHANGES.txt Mon Mar 15 18:15:22 2010 @@ -42,6 +42,7 @@ Release 0.20.4 - Unreleased HBASE-2311 Not having assertions enabled causes index contrib tests to fail HBASE-2034 Client sync block can cause 1 thread of a multi-threaded client to block all others (Karthik Ranganathan via Stack) + HBASE-2305 Client port for ZK has no default (Suraj Varma via Stack) IMPROVEMENTS HBASE-2180 Bad read performance from synchronizing hfile.fddatainputstream Modified: hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/HConstants.java URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/HConstants.java?rev=923370&r1=923369&r2=923370&view=diff ============================================================================== --- hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/HConstants.java (original) +++ hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/HConstants.java Mon Mar 15 18:15:22 2010 @@ -93,6 +93,9 @@ public interface HConstants { /** Default ZooKeeper pause value. In milliseconds. */ static final int DEFAULT_ZOOKEEPER_PAUSE = 2 * 1000; + /** default client port that the zookeeper listens on */ + static final int DEFAULT_ZOOKEPER_CLIENT_PORT = 2181; + /** Parameter name for port region server listens on. */ static final String REGIONSERVER_PORT = "hbase.regionserver.port"; Modified: hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.java URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.java?rev=923370&r1=923369&r2=923370&view=diff ============================================================================== --- hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.java (original) +++ hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.java Mon Mar 15 18:15:22 2010 @@ -60,6 +60,8 @@ public class HQuorumPeer implements HCon private static final String ZK_CFG_PROPERTY = "hbase.zookeeper.property."; private static final int ZK_CFG_PROPERTY_SIZE = ZK_CFG_PROPERTY.length(); + private static final String ZK_CLIENT_PORT_KEY = ZK_CFG_PROPERTY + + "clientPort"; /** * Parse ZooKeeper configuration from HBase XML config and run a QuorumPeer. @@ -195,6 +197,11 @@ public class HQuorumPeer implements HCon } } + // If clientPort is not set, assign the default + if (zkProperties.getProperty(ZK_CLIENT_PORT_KEY) == null) { + zkProperties.put(ZK_CLIENT_PORT_KEY, DEFAULT_ZOOKEPER_CLIENT_PORT); + } + // Create the server.X properties. int peerPort = conf.getInt("hbase.zookeeper.peerport", 2888); int leaderPort = conf.getInt("hbase.zookeeper.leaderport", 3888);