HBASE-23655 Fix flaky TestRSGroupsKillRS: should wait the SCP to finish

Author: infraio

hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsKillRS.java

@@ -39,8 +39,9 @@
 import org.apache.hadoop.hbase.client.Table;
 import org.apache.hadoop.hbase.client.TableDescriptor;
 import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
+import org.apache.hadoop.hbase.master.procedure.ServerCrashProcedure;
 import org.apache.hadoop.hbase.net.Address;
-import org.apache.hadoop.hbase.testclassification.MediumTests;
+import org.apache.hadoop.hbase.testclassification.LargeTests;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.JVMClusterUtil;
 import org.apache.hadoop.hbase.util.VersionInfo;
@@ -56,7 +57,7 @@
 
 import org.apache.hbase.thirdparty.com.google.common.collect.Sets;
 
-@Category({ MediumTests.class })
+@Category({ LargeTests.class })
 public class TestRSGroupsKillRS extends TestRSGroupsBase {
 
   @ClassRule
@@ -237,12 +238,12 @@ public void testLowerMetaGroupVersion() throws Exception{
     addGroup(groupName, groupRSCount);
 
     // move hbase:meta to meta_group
-    tableName = TableName.META_TABLE_NAME;
     Set<TableName> toAddTables = new HashSet<>();
-    toAddTables.add(tableName);
+    toAddTables.add(TableName.META_TABLE_NAME);
     rsGroupAdmin.moveTables(toAddTables, groupName);
-    assertTrue(rsGroupAdmin.getRSGroupInfo(groupName).getTables().contains(tableName));
-    TEST_UTIL.waitTableAvailable(tableName, 30000);
+    assertTrue(
+        rsGroupAdmin.getRSGroupInfo(groupName).getTables().contains(TableName.META_TABLE_NAME));
+    TEST_UTIL.waitUntilAllRegionsAssigned(TableName.META_TABLE_NAME, 30000);
 
     // restart the regionserver in meta_group, and lower its version
     String originVersion = "";
@@ -268,7 +269,9 @@ public void testLowerMetaGroupVersion() throws Exception{
     assertTrue(VersionInfo.compareVersion(originVersion,
         master.getRegionServerVersion(getServerName(servers.iterator().next()))) > 0);
     LOG.debug("wait for META assigned...");
-    TEST_UTIL.waitTableAvailable(tableName, 30000);
+    TEST_UTIL.waitFor(60000, () -> !TEST_UTIL.getHBaseCluster().getMaster().getProcedures().stream()
+        .filter(p -> (p instanceof ServerCrashProcedure)).findAny().isPresent());
+    TEST_UTIL.waitUntilAllRegionsAssigned(TableName.META_TABLE_NAME, 60000);
   }
 
   private static void setFinalStatic(Field field, Object newValue) throws Exception {