]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
rbd-mirror: improve detection of blacklisted state 33533/head
authorMykola Golub <mgolub@suse.com>
Wed, 19 Feb 2020 10:17:08 +0000 (10:17 +0000)
committerMykola Golub <mgolub@suse.com>
Tue, 25 Feb 2020 11:20:15 +0000 (13:20 +0200)
commit54207cd3b5d67acd1e942244378c718b5a7132f4
tree090eab4bca45a5fc062b73434359185c8c7c10e0
parent2b1d255d4ebabff2bddbbf54ee502acbc7e3740f
rbd-mirror: improve detection of blacklisted state

Fixes: https://tracker.ceph.com/issues/44159
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit cfb4f423a42d0265cb78ebb4eb8cc6924d6f45fa)

Conflicts:
src/tools/rbd_mirror/InstanceReplayer.h (ceph::mutex vs Mutex)
src/tools/rbd_mirror/NamespaceReplayer.cc (does not exist)
src/tools/rbd_mirror/PoolReplayer.cc (code from NamespaceReplayer is here)
src/test/rbd_mirror/test_mock_PoolReplayer.cc (accordingly to PoolReplayer.cc changes)
src/test/rbd_mirror/test_mock_PoolReplayer.cc
src/tools/rbd_mirror/InstanceReplayer.cc
src/tools/rbd_mirror/InstanceReplayer.h
src/tools/rbd_mirror/LeaderWatcher.cc
src/tools/rbd_mirror/LeaderWatcher.h
src/tools/rbd_mirror/PoolReplayer.cc