HBASE-4472 MiniHBaseCluster.shutdown() doesn't work if no active master

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1175050 13f79535-47bb-0310-9956-ffa450edef68
yuvrajm · Sep 23, 2011 · 1c43347 · 1c43347
1 parent eb06428
commit 1c43347
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -301,6 +301,7 @@ Release 0.92.0 - Unreleased
                (Ming Ma)
    HBASE-4468  Wrong resource name in an error massage: webapps instead of
                hbase-webapps (nkeywal)
+   HBASE-4472  MiniHBaseCluster.shutdown() doesn't work if no active master
 
   TESTS
    HBASE-4450  test for number of blocks read: to serve as baseline for expected

diff --git a/src/main/java/org/apache/hadoop/hbase/util/JVMClusterUtil.java b/src/main/java/org/apache/hadoop/hbase/util/JVMClusterUtil.java
@@ -218,9 +218,10 @@ public static void shutdown(final List<MasterThread> masters,
     }
     // regionServerThreads can never be null because they are initialized when
     // the class is constructed.
-      for(Thread t: regionservers) {
+      for(RegionServerThread t: regionservers) {
         if (t.isAlive()) {
           try {
+            t.getRegionServer().stop("Shutdown requested");
             t.join();
           } catch (InterruptedException e) {
             // continue