From 76a83f98b78a0bdf29bbb0f8e4c9ab74dae52be4 Mon Sep 17 00:00:00 2001 From: Atin Mukherjee Date: Thu, 9 Nov 2017 22:42:22 +0530 Subject: tests: fix bug-1483058-replace-brick-quorum-validation.t spurious failure Change-Id: I04c35305bfb663eabbf715eee78695adfd4a2d20 BUG: 1511310 Signed-off-by: Atin Mukherjee --- .../bugs/glusterd/bug-1483058-replace-brick-quorum-validation.t | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'tests/bugs') diff --git a/tests/bugs/glusterd/bug-1483058-replace-brick-quorum-validation.t b/tests/bugs/glusterd/bug-1483058-replace-brick-quorum-validation.t index 3dbe28a7917..2d9e5287818 100644 --- a/tests/bugs/glusterd/bug-1483058-replace-brick-quorum-validation.t +++ b/tests/bugs/glusterd/bug-1483058-replace-brick-quorum-validation.t @@ -45,7 +45,14 @@ TEST start_glusterd 2 EXPECT_WITHIN $PROBE_TIMEOUT 2 peer_count +# checking peer_count is not enough to call that quorum is regained as +# peer_count is based on peerinfo->connected where as quorum is calculated based +# on peerinfo->quorum_contrib. To avoid this spurious race of replace brick +# commit force to execute and fail before the quorum is regained run the command +# in EXPECT_WITHIN to ensure that with multiple attempts the command goes +# through once the quorum is regained. + # Now quorum is met. replace-brick will execute successfuly -TEST $CLI_1 volume replace-brick $V0 $H2:$B2/${V0}1 $H1:$B1/${V0}1_new commit force +EXPECT_WITHIN $PEER_SYNC_TIMEOUT 0 attempt_replace_brick 1 $V0 $H2:$B2/${V0}1 $H1:$B1/${V0}1_new #cleanup; -- cgit