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

HBASE-3213 If do abort of backup master will get NPE instead of graceful abort 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1033360 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Gray 2010-11-10 05:35:51 +00:00
parent 9f9de3410b
commit afeb06a5aa
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -669,6 +669,8 @@ Release 0.90.0 - Unreleased
place; i.e. that only one enable/disable runs at a time place; i.e. that only one enable/disable runs at a time
HBASE-2898 MultiPut makes proper error handling impossible and leads to HBASE-2898 MultiPut makes proper error handling impossible and leads to
corrupted data corrupted data
HBASE-3213 If do abort of backup master will get NPE instead of graceful
abort
IMPROVEMENTS IMPROVEMENTS

3
src/main/java/org/apache/hadoop/hbase/master/HMaster.java
View File

@ -279,7 +279,8 @@ implements HMasterInterface, HMasterRegionInterface, MasterServices, Server {
stopChores(); stopChores();
// Wait for all the remaining region servers to report in IFF we were // Wait for all the remaining region servers to report in IFF we were
// running a cluster shutdown AND we were NOT aborting. // running a cluster shutdown AND we were NOT aborting.
if (!this.abort && this.serverManager.isClusterShutdown()) { if (!this.abort && this.serverManager != null &&
this.serverManager.isClusterShutdown()) {
this.serverManager.letRegionServersShutdown(); this.serverManager.letRegionServersShutdown();
} }
stopServiceThreads(); stopServiceThreads();