From: Mykola Golub Date: Wed, 6 Jul 2016 09:59:25 +0000 (+0300) Subject: qa/workunits/rbd: before removing image make sure it is not bootstrapped X-Git-Tag: v10.2.4~61^2~27 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=775a999e8bac9d0dc02cb40f0206b96c5864b8d1;p=ceph.git qa/workunits/rbd: before removing image make sure it is not bootstrapped If an image is being bootstrapped, it implies that the rbd-mirror daemon currently has the image open. The removal API will prevent the removal of any image that is opened by another client. Works-around: http://tracker.ceph.com/issues/16555 Signed-off-by: Mykola Golub (cherry picked from commit 9737a8d6cbaf1b79bbc6008249d39acbae883941) --- diff --git a/qa/workunits/rbd/rbd_mirror.sh b/qa/workunits/rbd/rbd_mirror.sh index 9614d60900b5..9047483f7a67 100755 --- a/qa/workunits/rbd/rbd_mirror.sh +++ b/qa/workunits/rbd/rbd_mirror.sh @@ -183,6 +183,8 @@ unprotect_snapshot ${CLUSTER2} ${POOL} ${image5} 'snap2' for i in ${image3} ${image5}; do remove_snapshot ${CLUSTER2} ${POOL} ${i} 'snap1' remove_snapshot ${CLUSTER2} ${POOL} ${i} 'snap2' + # workaround #16555: before removing make sure it is not still bootstrapped + wait_for_image_replay_started ${CLUSTER1} ${POOL} ${i} remove_image ${CLUSTER2} ${POOL} ${i} done