hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r1196222 - in /hbase/branches/0.90: CHANGES.txt src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Date Tue, 01 Nov 2011 19:15:14 GMT
Author: stack
Date: Tue Nov  1 19:15:14 2011
New Revision: 1196222

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

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

Modified: hbase/branches/0.90/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1196222&r1=1196221&r2=1196222&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Tue Nov  1 19:15:14 2011
@@ -87,6 +87,8 @@ Release 0.90.5 - Unreleased
                (Jonathan Hsieh)
    HBASE-4508  Backport HBASE-3777 to 0.90 branch (Bright Fulton)
    HBASE-4277  HRS.closeRegion should be able to close regions with only the encoded name
(Ram)
+   HBASE-4695  WAL logs get deleted before region server can fully flush
+              (gaojinchao)
 
   IMPROVEMENT
    HBASE-4205  Enhance HTable javadoc (Eric Charles)

Modified: hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1196222&r1=1196221&r2=1196222&view=diff
==============================================================================
--- hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
(original)
+++ hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Tue Nov  1 19:15:14 2011
@@ -654,12 +654,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 at: " + this.serverInfo.getServerName());
     } else {
       closeAllRegions(abortRequested);
-      closeWAL(true);
       closeAllScanners();
       LOG.info("stopping server at: " + this.serverInfo.getServerName());
     }
@@ -668,7 +666,11 @@ public class HRegionServer implements HR
     if (this.catalogTracker != null) this.catalogTracker.stop();
     if (this.fsOk)
       waitOnAllRegionsToClose(abortRequested);
-
+    
+    //fsOk flag may be changed when closing region 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);



Mime
View raw message