From 185aec9c24b99c04e4bb8f9568050c9106ae9807 Mon Sep 17 00:00:00 2001 From: Enis Soztutar Date: Tue, 14 Jan 2014 03:29:20 +0000 Subject: [PATCH] HBASE-10274 MiniZookeeperCluster should close ZKDatabase when shutdown ZooKeeperServers (chendihao via enis) git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1557919 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.java index 5cb286bf2d3..3a42ea02b23 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.java @@ -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);