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

HBASE-3261 NPE out of HRS.run at startup when clock is out of sync 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1038756 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jean-Daniel Cryans 2010-11-24 18:35:05 +00:00
parent 9b45d9996f
commit 0bbfd1a364
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -711,6 +711,7 @@ Release 0.90.0 - Unreleased
HBASE-3269 HBase table truncate semantics seems broken as "disable" table
is now async by default
HBASE-3275 [rest] No gzip/deflate content encoding support
HBASE-3261 NPE out of HRS.run at startup when clock is out of sync
IMPROVEMENTS

12
src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
View File

@ -613,12 +613,12 @@ public class HRegionServer implements HRegionInterface, HBaseRPCErrorHandler,
// Send interrupts to wake up threads if sleeping so they notice shutdown.
// TODO: Should we check they are alive? If OOME could have exited already
cacheFlusher.interruptIfNecessary();
compactSplitThread.interruptIfNecessary();
hlogRoller.interruptIfNecessary();
this.majorCompactionChecker.interrupt();
if (this.cacheFlusher != null) this.cacheFlusher.interruptIfNecessary();
if (this.compactSplitThread != null) this.compactSplitThread.interruptIfNecessary();
if (this.hlogRoller != null) this.hlogRoller.interruptIfNecessary();
if (this.majorCompactionChecker != null) this.majorCompactionChecker.interrupt();
if (killed) {
if (this.killed) {
// Just skip out w/o closing regions.
} else if (abortRequested) {
if (this.fsOk) {
@ -634,7 +634,7 @@ public class HRegionServer implements HRegionInterface, HBaseRPCErrorHandler,
}
// Interrupt catalog tracker here in case any regions being opened out in
// handlers are stuck waiting on meta or root.
this.catalogTracker.stop();
if (this.catalogTracker != null) this.catalogTracker.stop();
waitOnAllRegionsToClose();
// Make sure the proxy is down.