svn commit: r1541784 - /hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java

[zj...@apache.org]

Author: zjushch
Date: Thu Nov 14 02:17:30 2013
New Revision: 1541784

URL: http://svn.apache.org/r1541784
Log:
HBASE-9810 Global memstore size will be calculated wrongly if replaying recovered edits throws exception

Modified:
    hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java

Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=1541784&r1=1541783&r2=1541784&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java Thu Nov 14 02:17:30 2013
@@ -2850,11 +2850,11 @@ public class HRegion implements HeapSize
           throw e;
         }
       }
-      // The edits size added into rsAccounting during this replaying will not
-      // be required any more. So just clear it.
-      if (this.rsAccounting != null) {
-        this.rsAccounting.clearRegionReplayEditsSize(this.getRegionName());
-      }
+    }
+    // The edits size added into rsAccounting during this replaying will not
+    // be required any more. So just clear it.
+    if (this.rsAccounting != null) {
+      this.rsAccounting.clearRegionReplayEditsSize(this.getRegionName());
     }
     if (seqid > minSeqIdForTheRegion) {
       // Then we added some edits to memory. Flush and cleanup split edit files.