Index: src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (revision 1195296) +++ src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (working copy) @@ -725,12 +725,10 @@ } 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); } @@ -742,7 +740,12 @@ LOG.info("stopping server " + this.serverNameFromMasterPOV + "; 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);