You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zg...@apache.org on 2020/08/21 02:55:19 UTC
[hbase] branch branch-2.2 updated: HBASE-24906 Enlarge the wait
time in
TestReplicationEndpoint/TestMetaWithReplicasBasic/TestAssignmentManagerMetrics
(#2277)
This is an automated email from the ASF dual-hosted git repository.
zghao pushed a commit to branch branch-2.2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.2 by this push:
new a5cbae2 HBASE-24906 Enlarge the wait time in TestReplicationEndpoint/TestMetaWithReplicasBasic/TestAssignmentManagerMetrics (#2277)
a5cbae2 is described below
commit a5cbae20b52eac2ed84dad737de14778faed9ec3
Author: Guanghao Zhang <zg...@apache.org>
AuthorDate: Fri Aug 21 10:54:53 2020 +0800
HBASE-24906 Enlarge the wait time in TestReplicationEndpoint/TestMetaWithReplicasBasic/TestAssignmentManagerMetrics (#2277)
Signed-off-by: meiyi <my...@gmail.com>
Signed-off-by: Viraj Jasani <vj...@apache.org>
---
.../org/apache/hadoop/hbase/client/TestMetaWithReplicasBasic.java | 4 ++--
.../org/apache/hadoop/hbase/master/TestAssignmentManagerMetrics.java | 4 ++--
.../org/apache/hadoop/hbase/replication/TestReplicationEndpoint.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMetaWithReplicasBasic.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMetaWithReplicasBasic.java
index e8e35d3..e6a3066 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMetaWithReplicasBasic.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMetaWithReplicasBasic.java
@@ -90,14 +90,14 @@ public class TestMetaWithReplicasBasic extends MetaWithReplicasTestBase {
final HMaster master = TEST_UTIL.getMiniHBaseCluster().getMaster();
master.stop("Restarting");
- TEST_UTIL.waitFor(30000, () -> master.isStopped());
+ TEST_UTIL.waitFor(60000, () -> master.isStopped());
TEST_UTIL.getMiniHBaseCluster().getConfiguration().setInt(HConstants.META_REPLICAS_NUM, 1);
JVMClusterUtil.MasterThread newMasterThread = TEST_UTIL.getMiniHBaseCluster().startMaster();
final HMaster newMaster = newMasterThread.getMaster();
//wait until new master finished meta replica assignment logic
- TEST_UTIL.waitFor(30000, () -> newMaster.getMasterQuotaManager() != null);
+ TEST_UTIL.waitFor(60000, () -> newMaster.getMasterQuotaManager() != null);
zkw = TEST_UTIL.getZooKeeperWatcher();
metaReplicaZnodes = zkw.getMetaReplicaNodes();
assertEquals(1, metaReplicaZnodes.size());
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerMetrics.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerMetrics.java
index 079bf93..1b18050 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerMetrics.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerMetrics.java
@@ -86,8 +86,8 @@ public class TestAssignmentManagerMetrics {
// set tablesOnMaster to none
conf.set("hbase.balancer.tablesOnMaster", "none");
- // set client sync wait timeout to 5sec
- conf.setInt("hbase.client.sync.wait.timeout.msec", 5000);
+ // set client sync wait timeout to 30 sec
+ conf.setInt("hbase.client.sync.wait.timeout.msec", 30000);
conf.setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 1);
conf.setInt(HConstants.HBASE_CLIENT_OPERATION_TIMEOUT, 2500);
// set a small interval for updating rit metrics
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.java
index 2a32e3d..5d7366d 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.java
@@ -233,7 +233,7 @@ public class TestReplicationEndpoint extends TestReplicationBase {
null);
final int numEdits = totEdits;
- Waiter.waitFor(CONF1, 30000, new Waiter.ExplainingPredicate<Exception>() {
+ Waiter.waitFor(CONF1, 60000, new Waiter.ExplainingPredicate<Exception>() {
@Override
public boolean evaluate() throws Exception {
return InterClusterReplicationEndpointForTest.replicateCount.get() == numEdits;