RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-18 17:37:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

osd: stop MgrClient callbacks on shutdown

Browse Source 
Stop the MgrClient callbacks to report PG stats at the
start of shutdown() so that we don't get a callback
during/after we are done shutting down.

Protect the cb update with the MgrClient's lock so that
we don't race with MgrClient::send_report() itself.

Fixes: http://tracker.ceph.com/issues/19638
Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2017-05-01 10:33:36 -04:00
parent 1c9a48cec8
commit 83c45ad6a4
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/mgr/MgrClient.h
View File

@ -95,6 +95,7 @@ public:
void set_pgstats_cb(std::function<MPGStats*()> cb_)
{
Mutex::Locker l(lock);
pgstats_cb = cb_;
}

2
src/osd/OSD.cc
View File

@ -2947,6 +2947,8 @@ int OSD::shutdown()
cct->_conf->set_val("debug_ms", "100");
cct->_conf->apply_changes(NULL);
mgrc.set_pgstats_cb(std::function<MPGStats*()>());
service.start_shutdown();
// stop sending work to pgs. this just prevents any new work in _process