HBASE-3445 Master crashes on data that was moved from different host

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1061564 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2011-01-20 23:13:00 +00:00
parent 2e44b84e73
commit e0c98543f1
1 changed files with 14 additions and 5 deletions

View File

@ -408,11 +408,7 @@ public class HBaseTestingUtility {
*/
public void shutdownMiniCluster() throws IOException {
LOG.info("Shutting down minicluster");
if (this.hbaseCluster != null) {
this.hbaseCluster.shutdown();
// Wait till hbase is down before going on to shutdown zk.
this.hbaseCluster.join();
}
shutdownMiniHBaseCluster();
if (!this.passedZkCluster) shutdownMiniZKCluster();
if (this.dfsCluster != null) {
// The below throws an exception per dn, AsynchronousCloseException.
@ -430,6 +426,19 @@ public class HBaseTestingUtility {
LOG.info("Minicluster is down");
}
/**
* Shutdown HBase mini cluster. Does not shutdown zk or dfs if running.
* @throws IOException
*/
public void shutdownMiniHBaseCluster() throws IOException {
if (this.hbaseCluster != null) {
this.hbaseCluster.shutdown();
// Wait till hbase is down before going on to shutdown zk.
this.hbaseCluster.join();
}
this.hbaseCluster = null;
}
/**
* Creates an hbase rootdir in user home directory. Also creates hbase
* version file. Normally you won't make use of this method. Root hbasedir