]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
mon/OSDMonitor: trim no-longer-exist failure reporters 30905/head
authorsu_nan@inspur.com <su_nan@inspur.com>
Fri, 6 Sep 2019 02:20:42 +0000 (10:20 +0800)
committerNathan Cutler <ncutler@suse.com>
Tue, 15 Oct 2019 08:41:13 +0000 (10:41 +0200)
commit7a272c4396bf3b2a346be7a643aad0aff97deb63
treed386f5c31f06cb1e4b31e7b55eabe798134efe0d
parent6b3ac130b9ebbc4ecda4bf5011908f56aa38f211
mon/OSDMonitor: trim no-longer-exist failure reporters

remove the report from failure_info in OSDMonitor::check_failure(), if
the reporter does not exist in the osdmap any longer. otherwise, we will
run into assert() failure when trying to lookup the osd in osdmap using
`osdmap.get_xinfo()`.

Fixes: https://tracker.ceph.com/issues/41680
Signed-off-by: NancySu05 <su_nan@inspur.com>
(cherry picked from commit 99ccc166ede5f296b86abfe9db0a3d597100edde)

Conflicts:
src/mon/OSDMonitor.cc
- ceph_assert, g_conf()
- account for C++17ism by moving iter initialization out of if statement
src/mon/OSDMonitor.cc