svn commit: r1003204 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/regionserver/handler/CloseRegionHandler.java

[jgray]

Author: jgray
Date: Thu Sep 30 18:53:20 2010
New Revision: 1003204

URL: http://svn.apache.org/viewvc?rev=1003204&view=rev
Log:
HBASE-3057  Race condition when closing regions that causes flakiness in 
TestRestartCluster

Modified:
    hbase/trunk/CHANGES.txt
    
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/handler/CloseRegionHandler.java

Modified: hbase/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1003204&r1=1003203&r2=1003204&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Thu Sep 30 18:53:20 2010
@@ -556,6 +556,8 @@ Release 0.21.0 - Unreleased
    HBASE-3054  Remore TestEmptyMetaInfo; it doesn't make sense any more.
    HBASE-3056  Fix ordering in ZKWatcher constructor to prevent weird race
                condition
+   HBASE-3057  Race condition when closing regions that causes flakiness in
+               TestRestartCluster
 
   IMPROVEMENTS
    HBASE-1760  Cleanup TODOs in HTable

Modified: 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/handler/CloseRegionHandler.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/handler/CloseRegionHandler.java?rev=1003204&r1=1003203&r2=1003204&view=diff
==============================================================================
--- 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/handler/CloseRegionHandler.java
 (original)
+++ 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/handler/CloseRegionHandler.java
 Thu Sep 30 18:53:20 2010
@@ -115,8 +115,8 @@ public class CloseRegionHandler extends 
     try {
       // TODO: If we need to keep updating CLOSING stamp to prevent against
       //       a timeout if this is long-running, need to spin up a thread?
-      this.rsServices.removeFromOnlineRegions(regionInfo.getEncodedName());
       region.close(abort);
+      this.rsServices.removeFromOnlineRegions(regionInfo.getEncodedName());
     } catch (IOException e) {
       LOG.error("IOException closing region for " + regionInfo);
       if (this.zk) deleteClosingState();