Index: src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (revision 1195114) +++ src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (working copy) @@ -708,12 +708,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); } @@ -725,6 +723,13 @@ LOG.info("stopping server " + this.serverNameFromMasterPOV + "; all regions closed."); } + if (!this.killed) { + if (abortRequested) { + if (this.fsOk) { + closeWAL(false); + } + } else closeWAL(true); + } // Make sure the proxy is down. if (this.hbaseMaster != null) {