svn commit: r1486349 - /hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java

[li...@apache.org]

Author: liyin
Date: Sat May 25 18:18:25 2013
New Revision: 1486349

URL: http://svn.apache.org/r1486349
Log:
[0.89-fb] [master] Ensure that we clear the openingRegions for a particular region; if there is an error for some reason

Author: aaiyer

Summary: If for some reason region open fails; we should clean up the openingRegions

Test Plan: run unit tests

Reviewers: rshroff, liyintang

Reviewed By: liyintang

CC: hbase-eng@

Differential Revision: https://phabricator.fb.com/D823512

Modified:
    hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java

Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1486349&r1=1486348&r2=1486349&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Sat May 25 18:18:25 2013
@@ -2262,6 +2262,14 @@ public class HRegionServer implements HR
           // TODO: Can we recover? Should be throw RTE?
           LOG.error("Failed to abort open region " + regionInfo.getRegionNameAsString(), e1);
         }
+
+        this.lock.writeLock().lock();
+        try {
+          this.regionsOpening.remove(mapKey);
+        } finally {
+          this.lock.writeLock().unlock();
+        }
+
         return;
       }
       this.lock.writeLock().lock();