From 30604761c4f2e72496c8cdd804536e239444012a Mon Sep 17 00:00:00 2001
From: stack <stack@apache.org>
Date: Wed, 25 Nov 2015 09:45:42 -0800
Subject: [PATCH] HBASE-14883 TestSplitTransactionOnCluster#testFailedSplit
 flakey

---
 .../hbase/regionserver/TestSplitTransactionOnCluster.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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 df0d87c7ee9..c70415e4425 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
@@ -1302,7 +1302,7 @@ public class TestSplitTransactionOnCluster {
       TESTING_UTIL.deleteTable(tableName);
     }
   }
-  
+
   @Test(timeout = 120000)
   public void testFailedSplit() throws Exception {
     TableName tableName = TableName.valueOf("testFailedSplit");
@@ -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();