From b27782b794dfd9958e3a4f2d28ed5e31bcb4c86d Mon Sep 17 00:00:00 2001 From: Duo Zhang Date: Tue, 27 Nov 2018 14:59:26 +0800 Subject: [PATCH] HBASE-21510 Addendum use procedure state as the waitFor condition --- .../replication/TestRegisterPeerWorkerWhenRestarting.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/replication/TestRegisterPeerWorkerWhenRestarting.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/replication/TestRegisterPeerWorkerWhenRestarting.java index f46bb418ea..0d2ccecfd2 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/replication/TestRegisterPeerWorkerWhenRestarting.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/replication/TestRegisterPeerWorkerWhenRestarting.java @@ -119,8 +119,11 @@ public class TestRegisterPeerWorkerWhenRestarting extends SyncReplicationTestBas FAIL = false; t.join(); // make sure the new master can finish the transition - UTIL2.waitFor(60000, () -> UTIL2.getAdmin() - .getReplicationPeerSyncReplicationState(PEER_ID) == SyncReplicationState.DOWNGRADE_ACTIVE); + UTIL2.waitFor(30000, () -> UTIL2.getMiniHBaseCluster().getMaster() != null); + UTIL2.waitFor(30000, + () -> UTIL2.getMiniHBaseCluster().getMaster().getProcedures().stream() + .filter(p -> p instanceof TransitPeerSyncReplicationStateProcedure) + .allMatch(p -> p.isFinished())); verify(UTIL2, 0, 100); } } -- 2.17.1