From: Mykola Golub Date: Sun, 29 Apr 2018 17:07:38 +0000 (+0300) Subject: qa/workunits/rbd: potential race in mirror disconnect test X-Git-Tag: v12.2.6~134^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0f4da2ba2ed4ecdd9196d04a11aca991edd492e1;p=ceph.git qa/workunits/rbd: potential race in mirror disconnect test (due to a typo in get_image_id command arg) Fixes: http://tracker.ceph.com/issues/23938 Signed-off-by: Mykola Golub (cherry picked from commit 5bc1d4a51a5a3c1e887c3c1054ed17b5f15ce2ed) --- diff --git a/qa/workunits/rbd/rbd_mirror.sh b/qa/workunits/rbd/rbd_mirror.sh index 3e7f844faea..c2308c355af 100755 --- a/qa/workunits/rbd/rbd_mirror.sh +++ b/qa/workunits/rbd/rbd_mirror.sh @@ -400,7 +400,7 @@ testlog " - rbd_mirroring_resync_after_disconnect config option" set_image_meta ${CLUSTER2} ${POOL} ${image} \ conf_rbd_mirroring_resync_after_disconnect true wait_for_replay_complete ${CLUSTER1} ${CLUSTER2} ${POOL} ${image} -image_id=$(get_image_id ${CLUSTER1} ${pool} ${image}) +image_id=$(get_image_id ${CLUSTER1} ${POOL} ${image}) disconnect_image ${CLUSTER2} ${POOL} ${image} wait_for_image_present ${CLUSTER1} ${POOL} ${image} 'deleted' ${image_id} wait_for_image_present ${CLUSTER1} ${POOL} ${image} 'present'