From bb41bdfdb14768b5d46b7b1334bba1a3909e2618 Mon Sep 17 00:00:00 2001 From: Zengran Zhang Date: Wed, 27 Mar 2019 09:39:31 +0800 Subject: [PATCH] osd: shutdown recovery_request_timer earlier recovery_request_timer may hold some QueuePeeringEvts which PGRef, if we dont shutdown it earlier, it potentially cause the PGRef leak when kicking pg. Fixes: https://tracker.ceph.com/issues/38945 Signed-off-by: Zengran Zhang --- src/osd/OSD.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 020fb437294..ded6e8c3baa 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -443,6 +443,11 @@ void OSDService::start_shutdown() std::lock_guard l(sleep_lock); sleep_timer.shutdown(); } + + { + std::lock_guard l(recovery_request_lock); + recovery_request_timer.shutdown(); + } } void OSDService::shutdown_reserver() @@ -464,11 +469,6 @@ void OSDService::shutdown() f->stop(); } - { - std::lock_guard l(recovery_request_lock); - recovery_request_timer.shutdown(); - } - osdmap = OSDMapRef(); next_osdmap = OSDMapRef(); } -- 2.39.5