From cb740b39903ae9893131888962fb81db5fc2a9b0 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 25 Jun 2014 08:43:32 -0700 Subject: [PATCH] mon: shut down perfcounters last In particular, remove_all_sessions updates the perfcounter stats, so we need to stop those after. Signed-off-by: Sage Weil --- src/mon/Monitor.cc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index f52788bc64f..004236254da 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -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(); -- 2.47.3