From bf869def43668df390df0c230a3342623de4f3f5 Mon Sep 17 00:00:00 2001
From: Viraj Jasani <vjasani@apache.org>
Date: Fri, 29 May 2020 18:05:02 +0530
Subject: [PATCH] HBASE-24428 : Fix for testSplitCompactWithPriority (ADDENDUM)

---
 .../hbase/regionserver/TestSplitTransactionOnCluster.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 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 a8425309eb6..3ad0c1e10f5 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
@@ -324,8 +324,10 @@ public class TestSplitTransactionOnCluster {
     // the procedure will return true; if the split fails, the procedure would throw exception.
     ProcedureTestingUtility.waitProcedure(cluster.getMaster().getMasterProcedureExecutor(),
       procId);
-
-    assertEquals(2, cluster.getRegions(tableName).size());
+    Thread.sleep(3000);
+    assertNotEquals("Table is not split properly?", -1,
+      TESTING_UTIL.waitFor(3000,
+        () -> cluster.getRegions(tableName).size() == 2));
     // we have 2 daughter regions
     HRegion hRegion1 = cluster.getRegions(tableName).get(0);
     HRegion hRegion2 = cluster.getRegions(tableName).get(1);
@@ -357,6 +359,8 @@ public class TestSplitTransactionOnCluster {
     // be accepted.
     assertTrue(compactionContext.get().getRequest().isAfterSplit());
     assertEquals(compactionContext.get().getRequest().getPriority(), Integer.MIN_VALUE + 10);
+    admin.disableTable(tableName);
+    admin.deleteTable(tableName);
   }
 
   public static class FailingSplitMasterObserver implements MasterCoprocessor, MasterObserver {