]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
librbd: migration abort should revert data back to the original image 37165/head
authorJason Dillaman <dillaman@redhat.com>
Wed, 5 Aug 2020 13:12:41 +0000 (09:12 -0400)
committerJason Dillaman <dillaman@redhat.com>
Wed, 16 Sep 2020 17:19:29 +0000 (13:19 -0400)
commitef65ef4990ad0fd7eb3b6c6b98b695f164f272e8
tree10d202be0748c8e0ee36ba84294acb04388c0145
parent423556aab73bb6549022c24b1f56f12ccb2f6031
librbd: migration abort should revert data back to the original image

If the migration destination image was modified and then the migration
was aborted, we need to copy the data back to the source image to avoid
losing data. For simplicity we will only revert the HEAD revision state
and will not attempt to copy new snapshots on the destination image
back to the source.

Fixes: https://tracker.ceph.com/issues/41394
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 5bd15da8be09a4e7644d411a0b0c132e5b795393)

Conflicts:
src/librbd/api/Migration.cc: trivial resolution
(cherry picked from commit f94c276accb8c9f4096b3bffc95362a921f2a2a5)

Conflicts:
        src/librbd/api/Migration.cc: snapshot-based mirroring changes
src/librbd/api/Migration.cc
src/librbd/api/Migration.h
src/test/librbd/test_Migration.cc