]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
osd: shutdown recovery_request_timer earlier 27938/head
authorZengran Zhang <zhangzengran@sangfor.com.cn>
Wed, 27 Mar 2019 01:39:31 +0000 (09:39 +0800)
committerPrashant D <pdhange@redhat.com>
Thu, 2 May 2019 23:57:23 +0000 (19:57 -0400)
commit557b913025add1c4ddc10c1fd92c0c27ee3540df
tree7c02a4446eed16a4fd373f747cf159ffeacdf990
parentc1d909d7db511d148be22efd8bdf6d5362500885
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 and start_shutdown
src/osd/OSD.cc