You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2018/05/02 02:58:58 UTC
[08/43] hbase git commit: HBASE-20476 Fix the flaky
TestReplicationSmallTests unit test
HBASE-20476 Fix the flaky TestReplicationSmallTests unit test
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/96ed407c
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/96ed407c
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/96ed407c
Branch: refs/heads/HBASE-19064
Commit: 96ed407c691ac0686fb14cdcd8680d1849e24ae8
Parents: e6220c8
Author: zhangduo <zh...@apache.org>
Authored: Thu Apr 26 20:46:09 2018 +0800
Committer: zhangduo <zh...@apache.org>
Committed: Fri Apr 27 10:25:52 2018 +0800
----------------------------------------------------------------------
.../hadoop/hbase/replication/SerialReplicationTestBase.java | 1 +
.../org/apache/hadoop/hbase/replication/TestReplicationBase.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/96ed407c/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/SerialReplicationTestBase.java
----------------------------------------------------------------------
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);
http://git-wip-us.apache.org/repos/asf/hbase/blob/96ed407c/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationBase.java
----------------------------------------------------------------------
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();