]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
librbd: migration abort should revert data back to the original image 37164/head
authorJason Dillaman <dillaman@redhat.com>
Wed, 5 Aug 2020 13:12:41 +0000 (09:12 -0400)
committerJason Dillaman <dillaman@redhat.com>
Tue, 15 Sep 2020 18:07:51 +0000 (14:07 -0400)
commitf94c276accb8c9f4096b3bffc95362a921f2a2a5
treed20699398aae7673376c5f807b8f7de5934916a4
parent2bc5229717326298ca964333fc07a38c5e48701e
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
src/librbd/api/Migration.cc
src/librbd/api/Migration.h
src/test/librbd/test_Migration.cc