From: Sage Weil <sage@redhat.com>
Date: Wed, 25 Jun 2014 15:43:32 +0000 (-0700)
Subject: mon: shut down perfcounters last
X-Git-Tag: v0.83~56^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F2022%2Fhead;p=ceph.git

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 <sage@redhat.com>
---

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index f52788bc64fd..004236254da3 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();