Repository: hbase Updated Branches: refs/heads/0.98 8b0fed475 -> ad6652d87
HBASE-12319: Inconsistencies during region recovery due to close/open of a region during recovery; REVERT -- UNSTABLE BUILD Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ad6652d8 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ad6652d8 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ad6652d8 Branch: refs/heads/0.98 Commit: ad6652d87045eaa745bbb754922214f8233f347e Parents: 8b0fed4 Author: stack <st...@apache.org> Authored: Tue Nov 4 09:26:13 2014 -0800 Committer: stack <st...@apache.org> Committed: Tue Nov 4 09:26:59 2014 -0800 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/regionserver/HRegionServer.java | 2 +- .../apache/hadoop/hbase/regionserver/TestRegionServerNoMaster.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/ad6652d8/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java index 29aecfe..7afa192 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -2664,7 +2664,7 @@ public class HRegionServer implements ClientProtos.ClientService.BlockingInterfa if (actualRegion == null) { // If already online, we still need to close it. LOG.info("The opening previously in progress has been cancelled by a CLOSE request."); // The master deletes the znode when it receives this exception. - throw new RegionAlreadyInTransitionException("The region " + encodedName + + throw new NotServingRegionException("The region " + encodedName + " was opening but not yet served. Opening is cancelled."); } } else if (Boolean.FALSE.equals(previous)) { http://git-wip-us.apache.org/repos/asf/hbase/blob/ad6652d8/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerNoMaster.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerNoMaster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerNoMaster.java index 8606b02..799a277 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerNoMaster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerNoMaster.java @@ -354,7 +354,7 @@ public class TestRegionServerNoMaster { getRS().closeRegion(null, crr); Assert.assertTrue(false); } catch (ServiceException expected) { - Assert.assertTrue(expected.getCause() instanceof RegionAlreadyInTransitionException); + Assert.assertTrue(expected.getCause() instanceof NotServingRegionException); } // The close should have left the ZK state as it is: it's the job the AM to delete it
