You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@hbase.apache.org by en...@apache.org on 2014/01/14 04:38:17 UTC

svn commit: r1557923 - /hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.java

Author: enis
Date: Tue Jan 14 03:38:16 2014
New Revision: 1557923

URL: http://svn.apache.org/r1557923
Log:
HBASE-10274 MiniZookeeperCluster should close ZKDatabase when shutdown ZooKeeperServers (chendihao via enis)

Modified:
    hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.java

Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.java?rev=1557923&r1=1557922&r2=1557923&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.java Tue Jan 14 03:38:16 2014
@@ -262,6 +262,8 @@ public class MiniZooKeeperCluster {
     if (!waitForServerDown(clientPort, CONNECTION_TIMEOUT)) {
       throw new IOException("Waiting for shutdown of standalone server");
     }
+    
+    zooKeeperServers.get(activeZKServerIndex).getZKDatabase().close();
 
     // remove the current active zk server
     standaloneServerFactoryList.remove(activeZKServerIndex);
@@ -303,6 +305,8 @@ public class MiniZooKeeperCluster {
     if (!waitForServerDown(clientPort, CONNECTION_TIMEOUT)) {
       throw new IOException("Waiting for shutdown of standalone server");
     }
+    
+    zooKeeperServers.get(backupZKServerIndex).getZKDatabase().close();
 
     // remove this backup zk server
     standaloneServerFactoryList.remove(backupZKServerIndex);