From d91697237ad77eaf60098536a2cd3538ea9aeabf Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Mon, 21 Nov 2016 15:31:43 -0500 Subject: [PATCH] qa/workunits/rbd: resolve potential rbd-mirror race conditions Fixes: http://tracker.ceph.com/issues/18935 Signed-off-by: Jason Dillaman (cherry picked from commit 63eae97afc1a92412525468263fb8696a243ebac) --- qa/workunits/rbd/rbd_mirror.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/qa/workunits/rbd/rbd_mirror.sh b/qa/workunits/rbd/rbd_mirror.sh index 3ccd678d54350..114f14127d5e5 100755 --- a/qa/workunits/rbd/rbd_mirror.sh +++ b/qa/workunits/rbd/rbd_mirror.sh @@ -38,6 +38,7 @@ compare_images ${POOL} ${image1} testlog "TEST: test the first image is replaying after restart" write_image ${CLUSTER2} ${POOL} ${image} 100 +wait_for_image_replay_started ${CLUSTER1} ${POOL} ${image} wait_for_replay_complete ${CLUSTER1} ${CLUSTER2} ${POOL} ${image} wait_for_status_in_pool_dir ${CLUSTER1} ${POOL} ${image} 'up+replaying' 'master_position' compare_images ${POOL} ${image} @@ -254,7 +255,9 @@ stop_mirror ${CLUSTER1} stop_mirror ${CLUSTER2} set_pool_mirror_mode ${CLUSTER2} ${POOL} 'image' disable_mirror ${CLUSTER2} ${POOL} ${image} -test_image_present ${CLUSTER1} ${POOL} ${image} 'present' +if [ -z "${RBD_MIRROR_USE_RBD_MIRROR}" ]; then + test_image_present ${CLUSTER1} ${POOL} ${image} 'present' +fi start_mirror ${CLUSTER1} wait_for_image_present ${CLUSTER1} ${POOL} ${image} 'deleted' set_pool_mirror_mode ${CLUSTER2} ${POOL} 'pool' @@ -283,6 +286,7 @@ testlog "TEST: request image resync while daemon is offline" stop_mirror ${CLUSTER1} request_resync_image ${CLUSTER1} ${POOL} ${image} image_id start_mirror ${CLUSTER1} +wait_for_image_present ${CLUSTER1} ${POOL} ${image} 'deleted' ${image_id} wait_for_image_replay_started ${CLUSTER1} ${POOL} ${image} wait_for_status_in_pool_dir ${CLUSTER1} ${POOL} ${image} 'up+replaying' 'master_position' compare_images ${POOL} ${image} -- 2.39.5