Repository: hbase Updated Branches: refs/heads/branch-1.1 f57c6193b -> 30855853f
HBASE-15120 Backport HBASE-14883 to branch-1.1 (Yu Li) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/30855853 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/30855853 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/30855853 Branch: refs/heads/branch-1.1 Commit: 30855853f0fc570138fc79f0316412fe32450b9a Parents: f57c619 Author: Nick Dimiduk <[email protected]> Authored: Wed Mar 9 20:27:04 2016 -0800 Committer: Nick Dimiduk <[email protected]> Committed: Wed Mar 9 20:27:04 2016 -0800 ---------------------------------------------------------------------- .../hbase/regionserver/TestSplitTransactionOnCluster.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/30855853/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 df0d87c..67c942b 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 @@ -1325,7 +1325,7 @@ public class TestSplitTransactionOnCluster { assertNotNull(observer); observer.latch.await(); observer.postSplit.await(); - LOG.info("Waiting for region to come out of RIT"); + LOG.info("Waiting for region to come out of RIT: " + actualRegion); TESTING_UTIL.waitFor(60000, 1000, new Waiter.Predicate<Exception>() { @Override public boolean evaluate() throws Exception { @@ -1336,7 +1336,9 @@ public class TestSplitTransactionOnCluster { }); regions = TESTING_UTIL.getHBaseAdmin().getTableRegions(tableName); assertTrue(regions.size() == 1); - assertTrue(admin.balancer()); + RegionStates regionStates = cluster.getMaster().getAssignmentManager().getRegionStates(); + Map<String, RegionState> rit = regionStates.getRegionsInTransition(); + assertTrue(rit.size() == 0); } finally { table.close(); connection.close();
