You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2014/01/26 05:52:39 UTC

svn commit: r1561453 - in /hbase/trunk/hbase-server/src: main/java/org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.java test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java

Author: stack
Date: Sun Jan 26 04:52:38 2014
New Revision: 1561453

URL: http://svn.apache.org/r1561453
Log:
HBASE-10317 getClientPort method of MiniZooKeeperCluster does not always return the correct value

Modified:
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.java
    hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.java?rev=1561453&r1=1561452&r2=1561453&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.java Sun Jan 26 04:52:38 2014
@@ -60,8 +60,6 @@ public class MiniZooKeeperCluster {
   /** The default port. If zero, we use a random port. */
   private int defaultClientPort = 0;
 
-  private int clientPort;
-
   private List<NIOServerCnxnFactory> standaloneServerFactoryList;
   private List<ZooKeeperServer> zooKeeperServers;
   private List<Integer> clientPortList;
@@ -196,7 +194,7 @@ public class MiniZooKeeperCluster {
     // set the first one to be active ZK; Others are backups
     activeZKServerIndex = 0;
     started = true;
-    clientPort = clientPortList.get(activeZKServerIndex);
+    int clientPort = clientPortList.get(activeZKServerIndex);
     LOG.info("Started MiniZK Cluster and connect 1 ZK server " +
         "on client port: " + clientPort);
     return clientPort;
@@ -394,6 +392,7 @@ public class MiniZooKeeperCluster {
   }
 
   public int getClientPort() {
-    return clientPort;
+    return activeZKServerIndex < 0 || activeZKServerIndex >= clientPortList.size() ? -1
+        : clientPortList.get(activeZKServerIndex);
   }
 }

Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java?rev=1561453&r1=1561452&r2=1561453&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java Sun Jan 26 04:52:38 2014
@@ -162,8 +162,15 @@ public class TestHBaseTestingUtility {
       assertEquals(4, cluster2.getBackupZooKeeperServerNum());
 
       // killing the current active zk server
-      assertTrue((cluster2.killCurrentActiveZooKeeperServer() >= defaultClientPort));
-      assertTrue((cluster2.killCurrentActiveZooKeeperServer() >= defaultClientPort));
+      int currentActivePort = cluster2.killCurrentActiveZooKeeperServer();
+      assertTrue(currentActivePort >= defaultClientPort);
+      // Check if the client port is returning a proper value
+      assertTrue(cluster2.getClientPort() == currentActivePort);
+
+      // kill another active zk server
+      currentActivePort = cluster2.killCurrentActiveZooKeeperServer();
+      assertTrue(currentActivePort >= defaultClientPort);
+      assertTrue(cluster2.getClientPort() == currentActivePort);      
       assertEquals(2, cluster2.getBackupZooKeeperServerNum());
       assertEquals(3, cluster2.getZooKeeperServerNum());
 
@@ -174,7 +181,9 @@ public class TestHBaseTestingUtility {
       assertEquals(1, cluster2.getZooKeeperServerNum());
 
       // killing the last zk server
-      assertTrue((cluster2.killCurrentActiveZooKeeperServer() == -1));
+      currentActivePort = cluster2.killCurrentActiveZooKeeperServer();
+      assertTrue(currentActivePort == -1);
+      assertTrue(cluster2.getClientPort() == currentActivePort);
       // this should do nothing.
       cluster2.killOneBackupZooKeeperServer();
       assertEquals(-1, cluster2.getBackupZooKeeperServerNum());