Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Zhihong Yu 2011-09-23 22:13:43 +00:00
parent 97e337f330
commit 8c94f9f825
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -301,6 +301,7 @@ Release 0.92.0 - Unreleased
(Ming Ma) (Ming Ma)
HBASE-4468 Wrong resource name in an error massage: webapps instead of HBASE-4468 Wrong resource name in an error massage: webapps instead of
hbase-webapps (nkeywal) hbase-webapps (nkeywal)
HBASE-4472 MiniHBaseCluster.shutdown() doesn't work if no active master
TESTS TESTS
HBASE-4450 test for number of blocks read: to serve as baseline for expected HBASE-4450 test for number of blocks read: to serve as baseline for expected

3
src/main/java/org/apache/hadoop/hbase/util/JVMClusterUtil.java
View File

@ -218,9 +218,10 @@ public class JVMClusterUtil {
} }
// regionServerThreads can never be null because they are initialized when // regionServerThreads can never be null because they are initialized when
// the class is constructed. // the class is constructed.
for(Thread t: regionservers) { for(RegionServerThread t: regionservers) {
if (t.isAlive()) { if (t.isAlive()) {
try { try {
t.getRegionServer().stop("Shutdown requested");
t.join(); t.join();
} catch (InterruptedException e) { } catch (InterruptedException e) {
// continue // continue