Author: stack
Date: Thu Jan 20 23:13:00 2011
New Revision: 1061564
URL: http://svn.apache.org/viewvc?rev=1061564&view=rev
Log:
HBASE-3445 Master crashes on data that was moved from different host
Modified:
hbase/trunk/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
Modified:
hbase/trunk/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java?rev=1061564&r1=1061563&r2=1061564&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
(original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
Thu Jan 20 23:13:00 2011
@@ -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.
@@ -431,6 +427,19 @@ public class HBaseTestingUtility {
}
/**
+ * 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
* is created for you as part of mini cluster startup. You'd only use this
