From 8a87193c23da36040d75e1619f2795b08383f6df Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Tue, 19 Dec 2017 16:29:18 -0500 Subject: [PATCH] qa/workunits/rbd: simplify split-brain test to avoid potential race Fixes: http://tracker.ceph.com/issues/22485 Signed-off-by: Jason Dillaman (cherry picked from commit 8c2ee6dd0f4c77b9fbbc24a673841b04d3e175d6) Conflicts: qa/workunits/rbd/rbd_mirror.sh --- qa/workunits/rbd/rbd_mirror.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/qa/workunits/rbd/rbd_mirror.sh b/qa/workunits/rbd/rbd_mirror.sh index 10507a2177722..f1ba50566adb5 100755 --- a/qa/workunits/rbd/rbd_mirror.sh +++ b/qa/workunits/rbd/rbd_mirror.sh @@ -370,12 +370,11 @@ testlog "TEST: split-brain" image=split-brain create_image ${CLUSTER2} ${POOL} ${image} wait_for_status_in_pool_dir ${CLUSTER1} ${POOL} ${image} 'up+replaying' 'master_position' -demote_image ${CLUSTER2} ${POOL} ${image} +promote_image ${CLUSTER1} ${POOL} ${image} --force +wait_for_image_replay_stopped ${CLUSTER1} ${POOL} ${image} wait_for_status_in_pool_dir ${CLUSTER1} ${POOL} ${image} 'up+stopped' -promote_image ${CLUSTER1} ${POOL} ${image} write_image ${CLUSTER1} ${POOL} ${image} 10 demote_image ${CLUSTER1} ${POOL} ${image} -promote_image ${CLUSTER2} ${POOL} ${image} wait_for_status_in_pool_dir ${CLUSTER1} ${POOL} ${image} 'up+error' 'split-brain' request_resync_image ${CLUSTER1} ${POOL} ${image} image_id wait_for_status_in_pool_dir ${CLUSTER1} ${POOL} ${image} 'up+replaying' 'master_position' -- 2.39.5