RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 11:07:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14896 from liewegas/wip-19638

Browse Source 
osd: stop MgrClient callbacks on shutdown

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
This commit is contained in:
Sage Weil 2017-05-01 20:25:29 -05:00 committed by GitHub
commit 0bded75235
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