svn commit: r1231231 - in /hbase/branches/0.90: CHANGES.txt src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java

[ra...@apache.org]

Author: ramkrishna
Date: Fri Jan 13 18:34:35 2012
New Revision: 1231231

URL: http://svn.apache.org/viewvc?rev=1231231&view=rev
Log:
HBASE-5184 Backport HBASE-5152 - Region is on service before completing initialization when doing rollback of split, it will affect read correctness (Ram)

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

Modified: hbase/branches/0.90/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1231231&r1=1231230&r2=1231231&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Fri Jan 13 18:34:35 2012
@@ -159,6 +159,8 @@ Release 0.90.5 - Dec 22, 2011
    HBASE-5168  Backport HBASE-5100 - Rollback of split could cause closed region to be opened again(Ram)
    HBASE-5178  Backport HBASE-4101 - Regionserver Deadlock (Ram)
    HBASE-5159  Backport HBASE-4079 - HTableUtil - helper class for loading data  (Ram)
+   HBASE-5184  Backport HBASE-5152 - Region is on service before completing 
+               initialization when doing rollback of split, it will affect read correctness (Ram)
  
   NEW FEATURE
    HBASE-4377  [hbck] Offline rebuild .META. from fs data only

Modified: hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=1231231&r1=1231230&r2=1231231&view=diff
==============================================================================
--- hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java (original)
+++ hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java Fri Jan 13 18:34:35 2012
@@ -335,9 +335,6 @@ public class HRegion implements HeapSize
    */
   public long initialize(final CancelableProgressable reporter)
   throws IOException {
-    // A region can be reopened if failed a split; reset flags
-    this.closing.set(false);
-    this.closed.set(false);
 
     // Write HRI to a file in case we need to recover .META.
     checkRegioninfoOnFilesystem();
@@ -373,6 +370,9 @@ public class HRegion implements HeapSize
     // (particularly if no recovered edits, seqid will be -1).
     long nextSeqid = maxSeqId + 1;
     LOG.info("Onlined " + this.toString() + "; next sequenceid=" + nextSeqid);
+    // A region can be reopened if failed a split; reset flags
+    this.closing.set(false);
+    this.closed.set(false);
     return nextSeqid;
   }