Repository: hbase Updated Branches: refs/heads/master 15cf0a6e7 -> 9ae615f82
HBASE-12694 testTableExistsIfTheSpecifiedTableRegionIsSplitParent in TestSplitTransactionOnCluster class leaves regions in transition (Vandana Ayyalasomayajula) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/9ae615f8 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/9ae615f8 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/9ae615f8 Branch: refs/heads/master Commit: 9ae615f82bc0521b7301bb5ea99f0367fc20f746 Parents: 15cf0a6 Author: Virag Kothari <[email protected]> Authored: Thu Dec 18 11:24:26 2014 -0800 Committer: Virag Kothari <[email protected]> Committed: Thu Dec 18 11:24:26 2014 -0800 ---------------------------------------------------------------------- .../TestSplitTransactionOnCluster.java | 21 ++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/9ae615f8/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java index 4138027..0d574f6 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java @@ -41,6 +41,7 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.Abortable; import org.apache.hadoop.hbase.CoordinatedStateManager; import org.apache.hadoop.hbase.Coprocessor; +import org.apache.hadoop.hbase.CoprocessorEnvironment; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; @@ -200,7 +201,10 @@ public class TestSplitTransactionOnCluster { this.admin.split(region.getRegionName(), new byte[] {42}); // we have to wait until the SPLITTING state is seen by the master - FailingSplitRegionObserver.latch.await(); + FailingSplitRegionObserver observer = (FailingSplitRegionObserver) region + .getCoprocessorHost().findCoprocessor(FailingSplitRegionObserver.class.getName()); + assertNotNull(observer); + observer.latch.await(); LOG.info("Waiting for region to come out of RIT"); TESTING_UTIL.waitFor(60000, 1000, new Waiter.Predicate<Exception>() { @@ -266,7 +270,11 @@ public class TestSplitTransactionOnCluster { } public static class FailingSplitRegionObserver extends BaseRegionObserver { - static volatile CountDownLatch latch = new CountDownLatch(1); + volatile CountDownLatch latch; + @Override + public void start(CoprocessorEnvironment e) throws IOException { + latch = new CountDownLatch(1); + } @Override public void preSplitBeforePONR(ObserverContext<RegionCoprocessorEnvironment> ctx, byte[] splitKey, List<Mutation> metaEntries) throws IOException { @@ -649,10 +657,19 @@ public class TestSplitTransactionOnCluster { tableExists = MetaTableAccessor.tableExists(regionServer.getConnection(), tableName); assertEquals("The specified table should present.", true, tableExists); + Map<String, RegionState> rit = cluster.getMaster().getAssignmentManager().getRegionStates() + .getRegionsInTransition(); + assertTrue(rit.size() == 3); + cluster.getMaster().getAssignmentManager().regionOffline(st.getFirstDaughter()); + cluster.getMaster().getAssignmentManager().regionOffline(st.getSecondDaughter()); + cluster.getMaster().getAssignmentManager().regionOffline(region.getRegionInfo()); + rit = cluster.getMaster().getAssignmentManager().getRegionStates().getRegionsInTransition(); + assertTrue(rit.size() == 0); } finally { admin.setBalancerRunning(true, false); cluster.getMaster().setCatalogJanitorEnabled(true); t.close(); + TESTING_UTIL.deleteTable(tableName); } }
