]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
rbd-mirror: prevent restored trash images from being deleted after delay 30825/head
authorJason Dillaman <dillaman@redhat.com>
Wed, 11 Sep 2019 20:30:16 +0000 (16:30 -0400)
committerJason Dillaman <dillaman@redhat.com>
Wed, 9 Oct 2019 21:24:09 +0000 (17:24 -0400)
commitb1a9115fcf6af74e49f2b0c8e01de922604446c6
tree8791bd80eb33d92b22bf5bffec9edfa72129e880
parent1cadc397bec4ba274e3e4d33173e82be7cc95518
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>
(cherry picked from commit f091a31d5252bba76598fffdc997275ca531621d)
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