]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
test/rbd-mirror: pool watcher registration error might result in race 37209/head
authorJason Dillaman <dillaman@redhat.com>
Wed, 5 Aug 2020 16:36:26 +0000 (12:36 -0400)
committerNathan Cutler <ncutler@suse.com>
Thu, 17 Sep 2020 05:12:43 +0000 (07:12 +0200)
commit26b56e69a9c41fa78d4cbbc4c018bcff4bfe32bb
tree2e4322a75f56406bfdbc8420aa586ac602ab1fa4
parentc81499f7ed711387009ee300dd9272365bf9d5e3
test/rbd-mirror: pool watcher registration error might result in race

The init finish context should be swapped out before it attempts to
re-register the watcher. This affects the test case which mocks the
timer to fire immediately instead of after 30 seconds.

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

Conflicts:
src/tools/rbd_mirror/PoolWatcher.cc
- nautilus uses Mutex::Locker where master has std::lock_guard
src/tools/rbd_mirror/PoolWatcher.cc