]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
rbd-mirror: renamed RemoveRequest state machine to TrashRemoveRequest
authorJason Dillaman <dillaman@redhat.com>
Wed, 11 Sep 2019 19:28:28 +0000 (15:28 -0400)
committerJason Dillaman <dillaman@redhat.com>
Wed, 9 Oct 2019 21:24:09 +0000 (17:24 -0400)
commit1cadc397bec4ba274e3e4d33173e82be7cc95518
tree7b59c61b0b5afe653b3ee5e6a8618ddfa3d4eb4f
parentab9e9f3ada8ffc1badeb006cd133f420c01fb33e
rbd-mirror: renamed RemoveRequest state machine to TrashRemoveRequest

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 55daa8e1e28f457a897070adfabf1583093aadd3)

Conflicts:
src/test/rbd_mirror/CMakeLists.txt: trivial resolution
src/tools/rbd_mirror/ImageDeleter.cc: trivial resolution
src/test/rbd_mirror/CMakeLists.txt
src/test/rbd_mirror/image_deleter/test_mock_RemoveRequest.cc [deleted file]
src/test/rbd_mirror/image_deleter/test_mock_TrashRemoveRequest.cc [new file with mode: 0644]
src/tools/rbd_mirror/CMakeLists.txt
src/tools/rbd_mirror/ImageDeleter.cc
src/tools/rbd_mirror/image_deleter/RemoveRequest.cc [deleted file]
src/tools/rbd_mirror/image_deleter/RemoveRequest.h [deleted file]
src/tools/rbd_mirror/image_deleter/TrashRemoveRequest.cc [new file with mode: 0644]
src/tools/rbd_mirror/image_deleter/TrashRemoveRequest.h [new file with mode: 0644]