RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-03 01:22:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2022 from ceph/wip-mon-perf

Browse Source 
mon: shut down perfcounters last

Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
This commit is contained in:
Sage Weil 2014-06-25 10:34:27 -07:00
commit 6a461a2d97
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/mon/Monitor.cc
View File

@ -676,18 +676,6 @@ void Monitor::shutdown()
}
elector.shutdown();
if (logger) {
cct->get_perfcounters_collection()->remove(logger);
delete logger;
logger = NULL;
}
if (cluster_logger) {
if (cluster_logger_registered)
cct->get_perfcounters_collection()->remove(cluster_logger);
delete cluster_logger;
cluster_logger = NULL;
}
// clean up
paxos->shutdown();
@ -702,6 +690,18 @@ void Monitor::shutdown()
remove_all_sessions();
if (logger) {
cct->get_perfcounters_collection()->remove(logger);
delete logger;
logger = NULL;
}
if (cluster_logger) {
if (cluster_logger_registered)
cct->get_perfcounters_collection()->remove(cluster_logger);
delete cluster_logger;
cluster_logger = NULL;
}
// unlock before msgr shutdown...
lock.Unlock();