]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
osd: shutdown recovery_request_timer earlier 27810/head
authorZengran Zhang <zhangzengran@sangfor.com.cn>
Wed, 27 Mar 2019 01:39:31 +0000 (09:39 +0800)
committerPrashant D <pdhange@redhat.com>
Fri, 26 Apr 2019 08:58:31 +0000 (04:58 -0400)
commit7d4b8f944155d4ea99609cfa9ed932c27e5b4542
tree36589a61b1cc5c1715b893d953ecdeecaab6f047
parent1436006594665279fe734b4c15d7e08c13ebd777
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 start_shutdown
src/osd/OSD.cc