HBASE-4695 WAL logs get deleted before region server can fully flush
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1196220 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
e34c773792
commit
d5364c2bfd
|
@ -433,6 +433,8 @@ Release 0.92.0 - Unreleased
|
|||
slowing down the shutdown by 0.5s
|
||||
HBASE-4552 multi-CF bulk load is not atomic across column families (Jonathan Hsieh)
|
||||
HBASE-4710 UnknownProtocolException should abort client retries
|
||||
HBASE-4695 WAL logs get deleted before region server can fully flush
|
||||
(gaojinchao)
|
||||
|
||||
TESTS
|
||||
HBASE-4450 test for number of blocks read: to serve as baseline for expected
|
||||
|
|
|
@ -725,12 +725,10 @@ public class HRegionServer implements HRegionInterface, HBaseRPCErrorHandler,
|
|||
} else if (abortRequested) {
|
||||
if (this.fsOk) {
|
||||
closeAllRegions(abortRequested); // Don't leave any open file handles
|
||||
closeWAL(false);
|
||||
}
|
||||
LOG.info("aborting server " + this.serverNameFromMasterPOV);
|
||||
} else {
|
||||
closeAllRegions(abortRequested);
|
||||
closeWAL(true);
|
||||
closeAllScanners();
|
||||
LOG.info("stopping server " + this.serverNameFromMasterPOV);
|
||||
}
|
||||
|
@ -743,6 +741,11 @@ public class HRegionServer implements HRegionInterface, HBaseRPCErrorHandler,
|
|||
"; all regions closed.");
|
||||
}
|
||||
|
||||
//fsOk flag may be changed when closing regions throws exception.
|
||||
if (!this.killed && this.fsOk) {
|
||||
closeWAL(abortRequested ? false : true);
|
||||
}
|
||||
|
||||
// Make sure the proxy is down.
|
||||
if (this.hbaseMaster != null) {
|
||||
HBaseRPC.stopProxy(this.hbaseMaster);
|
||||
|
|
Loading…
Reference in New Issue