From f4a3c030ddcde23266f005adea19b9e2421a82f1 Mon Sep 17 00:00:00 2001 From: zhangduo Date: Thu, 26 Apr 2018 20:46:09 +0800 Subject: [PATCH] HBASE-20476 Fix the flaky TestReplicationSmallTests unit test --- .../org/apache/hadoop/hbase/replication/SerialReplicationTestBase.java | 1 + .../java/org/apache/hadoop/hbase/replication/TestReplicationBase.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/SerialReplicationTestBase.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/SerialReplicationTestBase.java index 4b7fa87..259914e 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/SerialReplicationTestBase.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/SerialReplicationTestBase.java @@ -119,6 +119,7 @@ public class SerialReplicationTestBase { public static void setUpBeforeClass() throws Exception { UTIL.getConfiguration().setInt("replication.source.nb.capacity", 10); UTIL.getConfiguration().setLong("replication.sleep.before.failover", 1000); + UTIL.getConfiguration().setLong("hbase.serial.replication.waiting.ms", 100); UTIL.startMiniCluster(3); // disable balancer UTIL.getAdmin().balancerSwitch(false, true); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationBase.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationBase.java index e0798a4..b2c5aef 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationBase.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationBase.java @@ -87,7 +87,7 @@ public class TestReplicationBase { protected static final int NB_ROWS_IN_BIG_BATCH = NB_ROWS_IN_BATCH * 10; protected static final long SLEEP_TIME = 500; - protected static final int NB_RETRIES = 10; + protected static final int NB_RETRIES = 50; protected static final TableName tableName = TableName.valueOf("test"); protected static final byte[] famName = Bytes.toBytes("f"); @@ -185,6 +185,7 @@ public class TestReplicationBase { conf1.setInt("replication.source.maxretriesmultiplier", 10); conf1.setFloat("replication.source.ratio", 1.0f); conf1.setBoolean("replication.source.eof.autorecovery", true); + conf1.setLong("hbase.serial.replication.waiting.ms", 100); utility1 = new HBaseTestingUtility(conf1); utility1.startMiniZKCluster(); -- 2.7.4