From 0893ac3c3ee2dfc4c947a37b27516b51e7b24cd4 Mon Sep 17 00:00:00 2001 From: huaxiangsun Date: Thu, 2 Apr 2020 18:22:44 -0700 Subject: [PATCH] HBASE-24080 [flakey test] TestRegionReplicaFailover.testSecondaryRegionKill fails. (#1421) (#1424) Signed-off-by: stack --- .../hbase/regionserver/TestRegionReplicaFailover.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicaFailover.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicaFailover.java index cd9e1a560cff..8a2123e9dbc4 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicaFailover.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicaFailover.java @@ -41,7 +41,6 @@ import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread; import org.apache.hadoop.hbase.util.ServerRegionReplicaUtil; -import org.apache.hadoop.hbase.util.Threads; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; @@ -235,9 +234,10 @@ public void testSecondaryRegionKill() throws Exception { } assertTrue(aborted); - Threads.sleep(5000); - - HTU.verifyNumericRows(table, fam, 0, 1000, 1); + // It takes extra time for replica region is ready for read as during + // region open process, it needs to ask primary region to do a flush and replica region + // can open newly flushed hfiles to avoid data out-of-sync. + verifyNumericRowsWithTimeout(table, fam, 0, 1000, 1, 30000); HTU.verifyNumericRows(table, fam, 0, 1000, 2); }