Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@hbase.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1196220 - in /hbase/trunk: CHANGES.txt
 src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Date: Tue, 01 Nov 2011 19:12:11 -0000
To: commits@hbase.apache.org
From: stack@apache.org
Message-Id: <20111101191211.EC7842388847@eris.apache.org>

Author: stack
Date: Tue Nov  1 19:12:11 2011
New Revision: 1196220

URL: http://svn.apache.org/viewvc?rev=1196220&view=rev
Log:
HBASE-4695  WAL logs get deleted before region server can fully flush

Modified:
    hbase/trunk/CHANGES.txt
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java

Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1196220&r1=1196219&r2=1196220&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Tue Nov  1 19:12:11 2011
@@ -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

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1196220&r1=1196219&r2=1196220&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Tue Nov  1 19:12:11 2011
@@ -725,12 +725,10 @@ public class HRegionServer implements HR
     } 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 @@ public class HRegionServer implements HR
       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);