From: Brad Hubbard <bhubbard@redhat.com>
Date: Thu, 3 Dec 2020 00:24:24 +0000 (+1000)
Subject: mon: Delete logger in destructor
X-Git-Tag: v16.1.0~368^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F38410%2Fhead;p=ceph.git

mon: Delete logger in destructor

In theory we could race on the 'logger' object in a similar fashion to
https://tracker.ceph.com/issues/48386 where the race is on the
Paxos::logger object.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
---

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index dad67ab4d46..66d3a190efb 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -287,6 +287,7 @@ Monitor::~Monitor()
 
   delete config_key_service;
   delete paxos;
+  delete logger;
   ceph_assert(session_map.sessions.empty());
 }
 
@@ -1082,8 +1083,6 @@ void Monitor::shutdown()
 
   if (logger) {
     cct->get_perfcounters_collection()->remove(logger);
-    delete logger;
-    logger = NULL;
   }
   if (cluster_logger) {
     if (cluster_logger_registered)