hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r1155971 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/zookeeper/ZKConfig.java src/test/java/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java
Date Tue, 09 Aug 2011 23:31:31 GMT
Author: stack
Date: Tue Aug  9 23:31:30 2011
New Revision: 1155971

URL: http://svn.apache.org/viewvc?rev=1155971&view=rev
Log:
HBASE-4156 ZKConfig defaults clientPort improperly

Modified:
    hbase/trunk/CHANGES.txt
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKConfig.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java

Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1155971&r1=1155970&r2=1155971&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Tue Aug  9 23:31:30 2011
@@ -196,6 +196,8 @@ Release 0.91.0 - Unreleased
                (Michael Weng)
    HBASE-4181  HConnectionManager can't find cached HRegionInterface and makes clients
                work very slow (Jia Liu)
+   HBASE-4156  ZKConfig defaults clientPort improperly (Michajlo Matijkiw)
+
 
   IMPROVEMENTS
    HBASE-3290  Max Compaction Size (Nicolas Spiegelberg via Stack)  

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKConfig.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKConfig.java?rev=1155971&r1=1155970&r2=1155971&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKConfig.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKConfig.java Tue Aug  9 23:31:30
2011
@@ -47,8 +47,7 @@ public class ZKConfig {
 
   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";
+  private static final String ZK_CLIENT_PORT_KEY = "clientPort";
 
   /**
    * Make a Properties object holding ZooKeeper config equivalent to zoo.cfg.

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java?rev=1155971&r1=1155970&r2=1155971&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java Tue Aug
 9 23:31:30 2011
@@ -132,14 +132,11 @@ public class TestHQuorumPeer {
     assertEquals("foo.bar", server.addr.getHostName());
   }
 
-  /**
-   * Test Case for HBASE-2305
-   */
   @Test public void testShouldAssignDefaultZookeeperClientPort() {
     Configuration config = HBaseConfiguration.create();
     config.clear();
     Properties p = ZKConfig.makeZKProps(config);
     assertNotNull(p);
-    assertEquals(2181, p.get("hbase.zookeeper.property.clientPort"));
+    assertEquals(2181, p.get("clientPort"));
   }
 }



Mime
View raw message