svn commit: r734226 - in /hadoop/hbase/trunk: CHANGES.txt src/java/org/apache/hadoop/hbase/master/RegionManager.java

[ji...@apache.org]

Author: jimk
Date: Tue Jan 13 12:04:59 2009
New Revision: 734226

URL: http://svn.apache.org/viewvc?rev=734226&view=rev
Log:
HBASE-1125  IllegalStateException: Cannot set a region to be closed if it was not already marked as pending close

We now allow transition from either pendingOpen or pendingClose to closed.

Modified:
    hadoop/hbase/trunk/CHANGES.txt
    hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/RegionManager.java

Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=734226&r1=734225&r2=734226&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Tue Jan 13 12:04:59 2009
@@ -140,6 +140,8 @@
    HBASE-1116  generated web.xml and svn don't play nice together
    HBASE-1119  ArrayOutOfBoundsException in HStore.compact
    HBASE-1121  Cluster confused about where -ROOT- is
+   HBASE-1125  IllegalStateException: Cannot set a region to be closed if it was
+               not already marked as pending close
 
   IMPROVEMENTS
    HBASE-901   Add a limit to key length, check key and value length on client side

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/RegionManager.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/RegionManager.java?rev=734226&r1=734225&r2=734226&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/RegionManager.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/RegionManager.java Tue Jan 13 12:04:59 2009
@@ -1174,10 +1174,10 @@
     }
     
     synchronized void setClosed() {
-      if (!pendingClose) {
+      if (!pendingClose && !pendingOpen) {
         throw new IllegalStateException(
             "Cannot set a region to be closed if it was not already marked as" +
-            " pending close. State: " + toString());
+            " pending close or pending open. State: " + toString());
       }
       this.unassigned = false;
       this.pendingOpen = false;