From: Zengran Zhang <zhangzengran@sangfor.com.cn>
Date: Wed, 27 Mar 2019 01:39:31 +0000 (+0800)
Subject: osd: shutdown recovery_request_timer earlier
X-Git-Tag: v14.2.2~188^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a6ff9eaff60a7c7c4976c38481808c2d901a9a7d;p=ceph.git

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 <zhangzengran@sangfor.com.cn>
(cherry picked from commit bb41bdfdb14768b5d46b7b1334bba1a3909e2618)

Conflicts:
	src/osd/OSD.cc : Resolved in shutdown_reserver
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 960352d4f4cd..a2e04da8b871 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -444,6 +444,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()
@@ -465,11 +470,6 @@ void OSDService::shutdown()
     f->stop();
   }
 
-  {
-    std::lock_guard l(recovery_request_lock);
-    recovery_request_timer.shutdown();
-  }
-
   publish_map(OSDMapRef());
   next_osdmap = OSDMapRef();
 }