HBASE-22472 The newly split TestReplicationStatus* tests are flaky

Author: Apache9

hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStatusAfterLagging.java

@@ -45,7 +45,7 @@ public class TestReplicationStatusAfterLagging extends TestReplicationBase {
   @Test
   public void testReplicationStatusAfterLagging() throws Exception {
     utility2.shutdownMiniHBaseCluster();
-    restartHBaseCluster(utility1, NUM_SLAVES1);
+    restartHBaseCluster(utility1, 1);
     // add some values to cluster 1
     for (int i = 0; i < NB_ROWS_IN_BATCH; i++) {
       Put p = new Put(Bytes.toBytes("row" + i));

hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStatusBothNormalAndRecoveryLagging.java

@@ -52,7 +52,7 @@ public void testReplicationStatusBothNormalAndRecoveryLagging() throws Exception
       htable1.put(p);
     }
     Thread.sleep(10000);
-    restartHBaseCluster(utility1, NUM_SLAVES1);
+    restartHBaseCluster(utility1, 1);
     Admin hbaseAdmin = utility1.getAdmin();
     ServerName serverName = utility1.getHBaseCluster().getRegionServer(0).getServerName();
     Thread.sleep(10000);

hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStatusSourceStartedTargetStoppedNewOp.java

@@ -46,7 +46,7 @@ public class TestReplicationStatusSourceStartedTargetStoppedNewOp extends TestRe
   @Test
   public void testReplicationStatusSourceStartedTargetStoppedNewOp() throws Exception {
     utility2.shutdownMiniHBaseCluster();
-    restartHBaseCluster(utility1, NUM_SLAVES1);
+    restartHBaseCluster(utility1, 1);
     Admin hbaseAdmin = utility1.getAdmin();
     // add some values to source cluster
     for (int i = 0; i < NB_ROWS_IN_BATCH; i++) {

hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStatusSourceStartedTargetStoppedNoOps.java

@@ -41,9 +41,9 @@ public class TestReplicationStatusSourceStartedTargetStoppedNoOps extends TestRe
     HBaseClassTestRule.forClass(TestReplicationStatusSourceStartedTargetStoppedNoOps.class);
 
   @Test
-  public void c() throws Exception {
+  public void testReplicationStatusSourceStartedTargetStoppedNoOps() throws Exception {
     utility2.shutdownMiniHBaseCluster();
-    restartHBaseCluster(utility1, NUM_SLAVES1);
+    restartHBaseCluster(utility1, 1);
     Admin hbaseAdmin = utility1.getAdmin();
     ServerName serverName = utility1.getHBaseCluster().getRegionServer(0).getServerName();
     Thread.sleep(10000);

hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStatusSourceStartedTargetStoppedWithRecovery.java

@@ -54,7 +54,7 @@ public void testReplicationStatusSourceStartedTargetStoppedWithRecovery() throws
       htable1.put(p);
     }
     Thread.sleep(10000);
-    restartHBaseCluster(utility1, NUM_SLAVES1);
+    restartHBaseCluster(utility1, 1);
     Admin hbaseAdmin = utility1.getAdmin();
     ServerName serverName = utility1.getHBaseCluster().getRegionServer(0).getServerName();
     Thread.sleep(10000);