From 98a6347d1282792bb440e58de34190811ab567d5 Mon Sep 17 00:00:00 2001 From: Brad Hubbard Date: Thu, 3 Dec 2020 10:24:24 +1000 Subject: [PATCH] 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 --- src/mon/Monitor.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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) -- 2.47.3