Repository: hbase Updated Branches: refs/heads/0.98 51cb0fe6e -> 34f18715d refs/heads/branch-1 2b94aa8c8 -> 29940c286 refs/heads/master f1c41e307 -> dceaa2589
Revert "HBASE-12694 testTableExistsIfTheSpecifiedTableRegionIsSplitParent in TestSplitTransactionOnCluster class leaves regions in transition (Vandana Ayyalasomayajula)" This reverts commit 51cb0fe6eb3244de40dd508c9d68cb98e2ca4eca. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/34f18715 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/34f18715 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/34f18715 Branch: refs/heads/0.98 Commit: 34f18715db72a4ebed363226a28a04a9ae52404e Parents: 51cb0fe Author: Virag Kothari <[email protected]> Authored: Fri Dec 19 08:36:41 2014 -0800 Committer: Virag Kothari <[email protected]> Committed: Fri Dec 19 08:36:41 2014 -0800 ---------------------------------------------------------------------- .../hbase/regionserver/SplitTransaction.java | 2 +- .../TestSplitTransactionOnCluster.java | 32 +++----------------- 2 files changed, 6 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/34f18715/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java index 4618395..a35fd18 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java @@ -103,7 +103,7 @@ public class SplitTransaction { private HRegionInfo hri_b; private long fileSplitTimeout = 30000; private int znodeVersion = -1; - boolean useZKForAssignment = true; + boolean useZKForAssignment; /* * Row to split around http://git-wip-us.apache.org/repos/asf/hbase/blob/34f18715/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 8bf2684..b6744e0 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 @@ -46,7 +46,6 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.testclassification.LargeTests; -import org.apache.hadoop.hbase.CoprocessorEnvironment; import org.apache.hadoop.hbase.MasterNotRunningException; import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.RegionTransition; @@ -294,10 +293,7 @@ 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 observer = (FailingSplitRegionObserver) region - .getCoprocessorHost().findCoprocessor(FailingSplitRegionObserver.class.getName()); - assertNotNull(observer); - observer.latch.await(); + FailingSplitRegionObserver.latch.await(); LOG.info("Waiting for region to come out of RIT"); TESTING_UTIL.waitFor(60000, 1000, new Waiter.Predicate<Exception>() { @@ -316,26 +312,13 @@ public class TestSplitTransactionOnCluster { } public static class FailingSplitRegionObserver extends BaseRegionObserver { - volatile CountDownLatch latch; - volatile CountDownLatch postSplit; - @Override - public void start(CoprocessorEnvironment e) throws IOException { - latch = new CountDownLatch(1); - postSplit = new CountDownLatch(1); - } + static volatile CountDownLatch latch = new CountDownLatch(1); @Override public void preSplitBeforePONR(ObserverContext<RegionCoprocessorEnvironment> ctx, byte[] splitKey, List<Mutation> metaEntries) throws IOException { latch.countDown(); - LOG.info("Causing rollback of region split"); throw new IOException("Causing rollback of region split"); } - @Override - public void postCompleteSplit(ObserverContext<RegionCoprocessorEnvironment> ctx) - throws IOException { - postSplit.countDown(); - LOG.info("postCompleteSplit called"); - } } /** @@ -1179,7 +1162,7 @@ public class TestSplitTransactionOnCluster { return(null); } - @Test(timeout = 120000) + @Test public void testFailedSplit() throws Exception { TableName tableName = TableName.valueOf("testFailedSplit"); byte[] colFamily = Bytes.toBytes("info"); @@ -1195,23 +1178,18 @@ public class TestSplitTransactionOnCluster { // The following split would fail. admin.split(tableName.getNameAsString()); - FailingSplitRegionObserver observer = (FailingSplitRegionObserver) actualRegion - .getCoprocessorHost().findCoprocessor(FailingSplitRegionObserver.class.getName()); - assertNotNull(observer); - observer.latch.await(); - observer.postSplit.await(); + FailingSplitRegionObserver.latch.await(); LOG.info("Waiting for region to come out of RIT"); TESTING_UTIL.waitFor(60000, 1000, new Waiter.Predicate<Exception>() { @Override public boolean evaluate() throws Exception { RegionStates regionStates = cluster.getMaster().getAssignmentManager().getRegionStates(); Map<String, RegionState> rit = regionStates.getRegionsInTransition(); - return (rit.size() == 0); + return !rit.containsKey(actualRegion.getRegionInfo().getEncodedName()); } }); regions = TESTING_UTIL.getHBaseAdmin().getTableRegions(tableName); assertTrue(regions.size() == 1); - assertTrue(admin.balancer()); } finally { table.close(); TESTING_UTIL.deleteTable(tableName);
