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

[jd...@apache.org]

Author: jdcryans
Date: Wed Dec  8 21:48:07 2010
New Revision: 1043703

URL: http://svn.apache.org/viewvc?rev=1043703&view=rev
Log:
HBASE-3318  Split rollback leaves parent with writesEnabled=false

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=1043703&r1=1043702&r2=1043703&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Wed Dec  8 21:48:07 2010
@@ -732,6 +732,7 @@ Release 0.90.0 - Unreleased
    HBASE-3278  AssertionError in LoadBalancer
    HBASE-3173  HBase 2984 breaks ability to specify BLOOMFILTER & COMPRESSION
                via shell
+   HBASE-3318  Split rollback leaves parent with writesEnabled=false
 
 
   IMPROVEMENTS

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=1043703&r1=1043702&r2=1043703&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 Wed Dec  8 21:48:07 2010
@@ -355,10 +355,7 @@ public class HRegion implements HeapSize
     SplitTransaction.cleanupAnySplitDetritus(this);
     FSUtils.deleteDirectory(this.fs, new Path(regiondir, MERGEDIR));
 
-    // See if region is meant to run read-only.
-    if (this.regionInfo.getTableDesc().isReadOnly()) {
-      this.writestate.setReadOnly(true);
-    }
+    this.writestate.setReadOnly(this.regionInfo.getTableDesc().isReadOnly());
 
     this.writestate.compacting = false;
     this.lastFlushTime = EnvironmentEdgeManager.currentTimeMillis();