From 4855420922859d10ec7d99d64d609c4e1933322f Mon Sep 17 00:00:00 2001 From: Xiubo Li Date: Fri, 4 Mar 2022 15:10:46 +0800 Subject: [PATCH] ceph: move mdlog flush to scatter_writebehind() Signed-off-by: Xiubo Li (cherry picked from commit d41359a47e9f068de7f2e7e0cce99888abbf4069) --- src/mds/Locker.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc index 58b3723dc0b2b..41119d3800fcd 100644 --- a/src/mds/Locker.cc +++ b/src/mds/Locker.cc @@ -1198,7 +1198,6 @@ void Locker::eval_gather(SimpleLock *lock, bool first, bool *pneed_issue, MDSCon if (lock->is_dirty() && !lock->is_flushed()) { scatter_writebehind(static_cast(lock)); - mds->mdlog->flush(); return; } lock->clear_flushed(); @@ -4684,7 +4683,6 @@ bool Locker::simple_sync(SimpleLock *lock, bool *need_issue) if (!gather && lock->is_dirty()) { lock->get_parent()->auth_pin(lock); scatter_writebehind(static_cast(lock)); - mds->mdlog->flush(); return false; } @@ -4843,7 +4841,6 @@ void Locker::simple_lock(SimpleLock *lock, bool *need_issue) if (!gather && lock->is_dirty()) { lock->get_parent()->auth_pin(lock); scatter_writebehind(static_cast(lock)); - mds->mdlog->flush(); return; } @@ -4985,6 +4982,7 @@ void Locker::scatter_writebehind(ScatterLock *lock) in->finish_scatter_gather_update_accounted(lock->get_type(), &le->metablob); mds->mdlog->submit_entry(le, new C_Locker_ScatterWB(this, lock, mut)); + mds->mdlog->flush(); } void Locker::scatter_writebehind_finish(ScatterLock *lock, MutationRef& mut) -- 2.39.5