Author: tedyu
Date: Fri Sep 23 22:16:05 2011
New Revision: 1175051
URL: http://svn.apache.org/viewvc?rev=1175051&view=rev
Log:
HBASE-4472 MiniHBaseCluster.shutdown() doesn't work if no active master
Modified:
hbase/branches/0.92/CHANGES.txt
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/util/JVMClusterUtil.java
Modified: hbase/branches/0.92/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hbase/branches/0.92/CHANGES.txt?rev=1175051&r1=1175050&r2=1175051&view=diff
==============================================================================
--- hbase/branches/0.92/CHANGES.txt (original)
+++ hbase/branches/0.92/CHANGES.txt Fri Sep 23 22:16:05 2011
@@ -299,6 +299,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
IMPROVEMENTS
HBASE-3290 Max Compaction Size (Nicolas Spiegelberg via Stack)
Modified:
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/util/JVMClusterUtil.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/util/JVMClusterUtil.java?rev=1175051&r1=1175050&r2=1175051&view=diff
==============================================================================
---
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/util/JVMClusterUtil.java
(original)
+++
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/util/JVMClusterUtil.java
Fri Sep 23 22:16:05 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
