Apache/hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-13733 Failed MiniZooKeeperCluster startup did not shutdown ZK servers (Stephen Jiang)

Browse Source
This commit is contained in:
tedyu 2015-05-21 14:03:36 -07:00
parent 774bb5677e
commit c695d1c249
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.java
View File

@ -289,10 +289,6 @@ public class MiniZooKeeperCluster {
* @throws IOException * @throws IOException
*/ */
public void shutdown() throws IOException { public void shutdown() throws IOException {
if (!started) {
return;
}
// shut down all the zk servers // shut down all the zk servers
for (int i = 0; i < standaloneServerFactoryList.size(); i++) { for (int i = 0; i < standaloneServerFactoryList.size(); i++) {
NIOServerCnxnFactory standaloneServerFactory = NIOServerCnxnFactory standaloneServerFactory =
@ -304,19 +300,21 @@ public class MiniZooKeeperCluster {
throw new IOException("Waiting for shutdown of standalone server"); throw new IOException("Waiting for shutdown of standalone server");
} }
} }
standaloneServerFactoryList.clear();
for (ZooKeeperServer zkServer: zooKeeperServers) { for (ZooKeeperServer zkServer: zooKeeperServers) {
//explicitly close ZKDatabase since ZookeeperServer does not close them //explicitly close ZKDatabase since ZookeeperServer does not close them
zkServer.getZKDatabase().close(); zkServer.getZKDatabase().close();
} }
// clear everything
started = false;
activeZKServerIndex = 0;
standaloneServerFactoryList.clear();
clientPortList.clear();
zooKeeperServers.clear(); zooKeeperServers.clear();
LOG.info("Shutdown MiniZK cluster with all ZK servers"); // clear everything
if (started) {
started = false;
activeZKServerIndex = 0;
clientPortList.clear();
LOG.info("Shutdown MiniZK cluster with all ZK servers");
}
} }
/**@return clientPort return clientPort if there is another ZK backup can run /**@return clientPort return clientPort if there is another ZK backup can run