]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
rbd-mirror: prevent restored trash images from being deleted after delay 30351/head
authorJason Dillaman <dillaman@redhat.com>
Wed, 11 Sep 2019 20:30:16 +0000 (16:30 -0400)
committerJason Dillaman <dillaman@redhat.com>
Thu, 12 Sep 2019 02:21:11 +0000 (22:21 -0400)
commitf091a31d5252bba76598fffdc997275ca531621d
tree6b156d74622d695b1734835c0c0820d57131d3c6
parent55daa8e1e28f457a897070adfabf1583093aadd3
rbd-mirror: prevent restored trash images from being deleted after delay

The image deleter wasn't verifying whether or not an image was still in the trash
prior to deleting the image. This not only would incorrectly remove any restored
images but it will also leave the image id object and entry within the directory.

Fixes: https://tracker.ceph.com/issues/41780
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
src/test/rbd_mirror/image_deleter/test_mock_TrashRemoveRequest.cc
src/tools/rbd_mirror/image_deleter/TrashRemoveRequest.cc
src/tools/rbd_mirror/image_deleter/TrashRemoveRequest.h