Author: tedyu
Date: Fri Sep 23 22:13:43 2011
New Revision: 1175050
URL: http://svn.apache.org/viewvc?rev=1175050&view=rev
Log:
HBASE-4472 MiniHBaseCluster.shutdown() doesn't work if no active master
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/JVMClusterUtil.java
Modified: hbase/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1175050&r1=1175049&r2=1175050&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Fri Sep 23 22:13:43 2011
@@ -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
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/JVMClusterUtil.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/JVMClusterUtil.java?rev=1175050&r1=1175049&r2=1175050&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/JVMClusterUtil.java
(original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/JVMClusterUtil.java
Fri Sep 23 22:13:43 2011
@@ -218,9 +218,10 @@ public class JVMClusterUtil {
}
// 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
