Join GitHub today
GitHub is home to over 40 million developers working together to host and review code, manage projects, and build software together.Sign up
mimic: rbd-mirror: cannot restore deferred deletion mirrored images #30828
This better matches the current behavior where the images are only removed from the trash. Signed-off-by: Jason Dillaman <email@example.com> (cherry picked from commit 55daa8e) Conflicts: src/test/rbd_mirror/CMakeLists.txt: trivial resolution src/tools/rbd_mirror/ImageDeleter.cc: trivial resolution src/tools/rbd_mirror/image_deleter/TrashRemoveRequest.cc: trivial resolution
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 <firstname.lastname@example.org> (cherry picked from commit f091a31) Conflicts: src/test/rbd_mirror/image_deleter/test_mock_TrashRemoveRequest.cc: removed state test cases src/tools/rbd_mirror/image_deleter/TrashRemoveRequest.h/cc: removed state validation
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments.