svn commit: r1156774 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java

[te...@apache.org]

Author: tedyu
Date: Thu Aug 11 19:45:23 2011
New Revision: 1156774

URL: http://svn.apache.org/viewvc?rev=1156774&view=rev
Log:
HBASE-4186  No region is added to regionsInTransitionInRS

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

Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1156774&r1=1156773&r2=1156774&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Thu Aug 11 19:45:23 2011
@@ -199,6 +199,7 @@ Release 0.91.0 - Unreleased
    HBASE-4156  ZKConfig defaults clientPort improperly (Michajlo Matijkiw)
    HBASE-4184  CatalogJanitor doesn't work properly when "fs.default.name" isn't
                set in config file (Ming Ma)
+   HBASE-4186  No region is added to regionsInTransitionInRS
 
   IMPROVEMENTS
    HBASE-3290  Max Compaction Size (Nicolas Spiegelberg via Stack)  

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1156774&r1=1156773&r2=1156774&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Thu Aug 11 19:45:23 2011
@@ -2336,6 +2336,7 @@ public class HRegionServer implements HR
     }
     LOG.info("Received request to open region: " +
       region.getRegionNameAsString());
+    this.regionsInTransitionInRS.add(region.getEncodedNameAsBytes());
     HTableDescriptor htd = this.tableDescriptors.get(region.getTableName());
     if (region.isRootRegion()) {
       this.service.submit(new OpenRootHandler(this, this, region, htd));
@@ -2397,6 +2398,7 @@ public class HRegionServer implements HR
           region.getEncodedName());
       return false;
     }
+    this.regionsInTransitionInRS.add(region.getEncodedNameAsBytes());
     CloseRegionHandler crh = null;
     if (region.isRootRegion()) {
       crh = new CloseRootHandler(this, this, region, abort, zk);