]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/workunits/rbd: before removing image make sure it is not bootstrapped
authorMykola Golub <mgolub@mirantis.com>
Wed, 6 Jul 2016 09:59:25 +0000 (12:59 +0300)
committerJason Dillaman <dillaman@redhat.com>
Tue, 11 Oct 2016 16:50:09 +0000 (12:50 -0400)
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 <mgolub@mirantis.com>
(cherry picked from commit 9737a8d6cbaf1b79bbc6008249d39acbae883941)

qa/workunits/rbd/rbd_mirror.sh

index 9614d60900b55ab99a7ba69906ee11e5d87f448e..9047483f7a677e14b160737a3a34dc496f70ba92 100755 (executable)
@@ -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