HBASE-21510 Test TestRegisterPeerWorkerWhenRestarting is flakey
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/701526d1 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/701526d1 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/701526d1 Branch: refs/heads/HBASE-20952 Commit: 701526d19f284f525dcb6d3e495ffa8132bd1483 Parents: d9c773b Author: zhangduo <zhang...@apache.org> Authored: Sat Nov 24 19:50:59 2018 +0800 Committer: zhangduo <zhang...@apache.org> Committed: Sat Nov 24 19:50:59 2018 +0800 ---------------------------------------------------------------------- .../replication/TestRegisterPeerWorkerWhenRestarting.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/701526d1/hbase-server/src/test/java/org/apache/hadoop/hbase/master/replication/TestRegisterPeerWorkerWhenRestarting.java ---------------------------------------------------------------------- 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 72aa32d..f46bb41 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 @@ -19,7 +19,6 @@ package org.apache.hadoop.hbase.master.replication; import static org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.RecoverStandbyState.DISPATCH_WALS_VALUE; import static org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.RecoverStandbyState.UNREGISTER_PEER_FROM_WORKER_STORAGE_VALUE; -import static org.junit.Assert.assertEquals; import java.io.IOException; import java.io.UncheckedIOException; @@ -119,9 +118,9 @@ public class TestRegisterPeerWorkerWhenRestarting extends SyncReplicationTestBas mt.join(); FAIL = false; t.join(); - // make sure the new master can finish the transiting - assertEquals(SyncReplicationState.DOWNGRADE_ACTIVE, - UTIL2.getAdmin().getReplicationPeerSyncReplicationState(PEER_ID)); + // make sure the new master can finish the transition + UTIL2.waitFor(60000, () -> UTIL2.getAdmin() + .getReplicationPeerSyncReplicationState(PEER_ID) == SyncReplicationState.DOWNGRADE_ACTIVE); verify(UTIL2, 0, 100); } }