]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
mds: do not call Journaler::_trim twice 25562/head
authorTang Junhui <tangjunhui@sangfor.com>
Thu, 22 Nov 2018 12:21:46 +0000 (20:21 +0800)
committerNathan Cutler <ncutler@suse.com>
Fri, 14 Dec 2018 10:26:26 +0000 (11:26 +0100)
commita6a6729cad4f2cf0335c2b633b11291adf16a15d
treea83f68733395e059c1f878872ca1f771d37d04c3
parent2083a34e86eaeef06e951eb2ff056457d029734b
mds: do not call Journaler::_trim twice

Journaler::_trim is called in the routine:
PurgeQueue::_execute_item
==>Journaler::write_head
==>Journaler::_finish_write_head
==>Journaler::_trim
so do not register callback in PurgeQueue::_execute_item
to call Journaler::_trim again.

Signed-off-by: Tang Junhui <tangjunhui@sangfor.com>
Fixes: http://tracker.ceph.com/issues/37566
(cherry picked from commit a509b5719bc44a63d7664a1b019adca6a3993f19)
src/mds/PurgeQueue.cc