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

[li...@apache.org]

Author: liyin
Date: Tue Dec 24 19:18:16 2013
New Revision: 1553320

URL: http://svn.apache.org/r1553320
Log:
[0.89-fb] [master] Fix TestHRegionDoubleClose

Author: aaiyer

Summary: Fix TestHRegionDoubleClose

Test Plan: run TestHRegionDoubleClose

Reviewers: rshroff, liyintang

Reviewed By: liyintang

CC: hbase-eng@

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

Task ID: 2973864

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=1553320&r1=1553319&r2=1553320&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 Tue Dec 24 19:18:16 2013
@@ -2340,7 +2340,13 @@ public class HRegionServer implements HR
           serverInfo.getServerName(), hri.getEncodedName());
       zkUpdater.startRegionCloseEvent(null, false);
     }
-    HRegion region = getRegion(hri.getRegionName());
+    HRegion region;
+    try {
+      region = getRegion(hri.getRegionName());
+    } catch (NotServingRegionException ex) {
+      // This is fine. Region is already closed.
+      return;
+    }
     if (region == null) {
       region = this.removeFromRetryCloseRegions(hri);
     }