Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mimic: rbd-mirror: cannot restore deferred deletion mirrored images #30828

Merged
merged 5 commits into from Oct 17, 2019

Conversation

@dillaman
Copy link
Contributor

dillaman commented Oct 10, 2019

trociny and others added 5 commits Apr 15, 2019
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit 8455d66)

Conflicts:
	src/librbd/trash/RemoveRequest.cc/h: removed set state calls
	src/test/librbd/trash/test_mock_RemoveRequest.cc: removed set state test cases
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
This will allow the the image to be restored and re-mirrored if
desired.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 73d4577)

Conflicts:
	src/test/rbd_mirror/image_deleter/test_mock_TrashMoveRequest.cc: trivial resolution
This better matches the current behavior where the images are only
removed from the trash.

Signed-off-by: Jason Dillaman <dillaman@redhat.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 <dillaman@redhat.com>
(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
@trociny trociny added this to the mimic milestone Oct 10, 2019
@yuriw

This comment has been minimized.

Copy link
Contributor

yuriw commented Oct 10, 2019

@yuriw yuriw merged commit a3a7855 into ceph:mimic Oct 17, 2019
4 checks passed
4 checks passed
Docs: build check OK - docs built
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details
@dillaman dillaman deleted the dillaman:wip-41882-mimic branch Oct 17, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.