Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-12319: Inconsistencies during region recovery due to close/open of a region during recovery; REVERT -- UNSTABLE BUILD

This commit is contained in:
stack 2014-11-04 09:26:13 -08:00
parent b827b6d02e
commit a347d32cc5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
View File

@ -2591,7 +2591,7 @@ public class HRegionServer extends HasThread implements
if (actualRegion == null) { // If already online, we still need to close it. 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."); LOG.info("The opening previously in progress has been cancelled by a CLOSE request.");
// The master deletes the znode when it receives this exception. // 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."); " was opening but not yet served. Opening is cancelled.");
} }
} else if (Boolean.FALSE.equals(previous)) { } else if (Boolean.FALSE.equals(previous)) {

2
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerNoMaster.java
View File

@ -402,7 +402,7 @@ public class TestRegionServerNoMaster {
getRS().rpcServices.closeRegion(null, crr); getRS().rpcServices.closeRegion(null, crr);
Assert.assertTrue(false); Assert.assertTrue(false);
} catch (ServiceException expected) { } 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 // The close should have left the ZK state as it is: it's the job the AM to delete it