]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
rbd-mirror: ensure remote demotion is replayed locally
authorJason Dillaman <dillaman@redhat.com>
Fri, 4 May 2018 15:14:34 +0000 (11:14 -0400)
committerJason Dillaman <dillaman@redhat.com>
Thu, 10 May 2018 11:44:38 +0000 (07:44 -0400)
commita6aeb7ab436c9ce03d7e3bed5d19b3df599dd4c5
tree9d981f655ac6cb999f383179605e4269bdd95808
parenta189ab9c5bfb5930330ffd20d83b04b18b333b46
rbd-mirror: ensure remote demotion is replayed locally

The bootstrap process cannot immediately quit if it notices the remote
image is not primary. Instead, it needs to continue if the local image is
still chained to the remote.

Fixes: http://tracker.ceph.com/issues/24009
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit d35bc94319c6fa267e973e533f4591568289ee96)
src/test/rbd_mirror/image_replayer/test_mock_BootstrapRequest.cc
src/tools/rbd_mirror/image_replayer/BootstrapRequest.cc
src/tools/rbd_mirror/image_replayer/BootstrapRequest.h
src/tools/rbd_mirror/image_replayer/IsPrimaryRequest.cc
src/tools/rbd_mirror/image_replayer/OpenLocalImageRequest.cc