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:
parent
2e44b84e73
commit
e0c98543f1
|
@ -408,11 +408,7 @@ public class HBaseTestingUtility {
|
||||||
*/
|
*/
|
||||||
public void shutdownMiniCluster() throws IOException {
|
public void shutdownMiniCluster() throws IOException {
|
||||||
LOG.info("Shutting down minicluster");
|
LOG.info("Shutting down minicluster");
|
||||||
if (this.hbaseCluster != null) {
|
shutdownMiniHBaseCluster();
|
||||||
this.hbaseCluster.shutdown();
|
|
||||||
// Wait till hbase is down before going on to shutdown zk.
|
|
||||||
this.hbaseCluster.join();
|
|
||||||
}
|
|
||||||
if (!this.passedZkCluster) shutdownMiniZKCluster();
|
if (!this.passedZkCluster) shutdownMiniZKCluster();
|
||||||
if (this.dfsCluster != null) {
|
if (this.dfsCluster != null) {
|
||||||
// The below throws an exception per dn, AsynchronousCloseException.
|
// The below throws an exception per dn, AsynchronousCloseException.
|
||||||
|
@ -430,6 +426,19 @@ public class HBaseTestingUtility {
|
||||||
LOG.info("Minicluster is down");
|
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
|
* Creates an hbase rootdir in user home directory. Also creates hbase
|
||||||
* version file. Normally you won't make use of this method. Root hbasedir
|
* version file. Normally you won't make use of this method. Root hbasedir
|
||||||
|
|
Loading…
Reference in New Issue