[hbase] branch branch-2 updated: HBASE-22472 The newly split TestReplicationStatus* tests are flaky

[zhangduo]

This is an automated email from the ASF dual-hosted git repository.

zhangduo pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2 by this push:
     new e4057c5  HBASE-22472 The newly split TestReplicationStatus* tests are 
flaky
e4057c5 is described below

commit e4057c555566b9aae4b714df3fc880cc12c2053f
Author: Duo Zhang <zhang...@apache.org>
AuthorDate: Thu May 30 15:55:37 2019 +0800

    HBASE-22472 The newly split TestReplicationStatus* tests are flaky
---
 .../hadoop/hbase/replication/TestReplicationStatusAfterLagging.java   | 2 +-
 .../TestReplicationStatusBothNormalAndRecoveryLagging.java            | 2 +-
 .../TestReplicationStatusSourceStartedTargetStoppedNewOp.java         | 2 +-
 .../TestReplicationStatusSourceStartedTargetStoppedNoOps.java         | 4 ++--
 .../TestReplicationStatusSourceStartedTargetStoppedWithRecovery.java  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStatusAfterLagging.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStatusAfterLagging.java
index 1993d34..0ec98e9 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStatusAfterLagging.java
+++ 
b/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));
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStatusBothNormalAndRecoveryLagging.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStatusBothNormalAndRecoveryLagging.java
index 4bb41f8..75255bb 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStatusBothNormalAndRecoveryLagging.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStatusBothNormalAndRecoveryLagging.java
@@ -52,7 +52,7 @@ public class 
TestReplicationStatusBothNormalAndRecoveryLagging extends TestRepli
       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);
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStatusSourceStartedTargetStoppedNewOp.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStatusSourceStartedTargetStoppedNewOp.java
index fb3f16b..a8f266a 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStatusSourceStartedTargetStoppedNewOp.java
+++ 
b/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++) {
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStatusSourceStartedTargetStoppedNoOps.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStatusSourceStartedTargetStoppedNoOps.java
index 76d12b2..6625eb5 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStatusSourceStartedTargetStoppedNoOps.java
+++ 
b/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);
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStatusSourceStartedTargetStoppedWithRecovery.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStatusSourceStartedTargetStoppedWithRecovery.java
index 800fa82..0b5f6e8 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStatusSourceStartedTargetStoppedWithRecovery.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStatusSourceStartedTargetStoppedWithRecovery.java
@@ -54,7 +54,7 @@ public class 
TestReplicationStatusSourceStartedTargetStoppedWithRecovery
       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);