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:32:18 UTC
svn commit: r1557921 -
/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.java
Author: enis
Date: Tue Jan 14 03:32:17 2014
New Revision: 1557921
URL: http://svn.apache.org/r1557921
Log:
HBASE-10274 MiniZookeeperCluster should close ZKDatabase when shutdown ZooKeeperServers (chendihao via enis)
Modified:
hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.java
Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.java?rev=1557921&r1=1557920&r2=1557921&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.java Tue Jan 14 03:32:17 2014
@@ -270,6 +270,8 @@ public class MiniZooKeeperCluster {
throw new IOException("Waiting for shutdown of standalone server");
}
+ zooKeeperServers.get(activeZKServerIndex).getZKDatabase().close();
+
// remove the current active zk server
standaloneServerFactoryList.remove(activeZKServerIndex);
clientPortList.remove(activeZKServerIndex);
@@ -311,6 +313,8 @@ public class MiniZooKeeperCluster {
throw new IOException("Waiting for shutdown of standalone server");
}
+ zooKeeperServers.get(backupZKServerIndex).getZKDatabase().close();
+
// remove this backup zk server
standaloneServerFactoryList.remove(backupZKServerIndex);
clientPortList.remove(backupZKServerIndex);