From: Zhansong Gao <zhsgao@hotmail.com>
Date: Fri, 16 Jun 2023 04:30:40 +0000 (+0800)
Subject: mds: the assert should be before the journal entry submit otherwise it's racy
X-Git-Tag: v20.0.0~664^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=11a4303d66fa0355c890a478b33ccc90ee68f6d3;p=ceph.git

mds: the assert should be before the journal entry submit otherwise it's racy

Signed-off-by: Zhansong Gao <zhsgao@hotmail.com>
---

diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc
index 722b6bd742262..99991f50aa703 100644
--- a/src/mds/Migrator.cc
+++ b/src/mds/Migrator.cc
@@ -1957,10 +1957,10 @@ void Migrator::handle_export_ack(const cref_t<MExportDirAck> &m)
   // this keeps authority().first in sync with subtree auth state in the journal.
   mdcache->adjust_subtree_auth(dir, it->second.peer, mds->get_nodeid());
 
+  ceph_assert(g_conf()->mds_kill_export_at != 10);
   // log export completion, then finish (unfreeze, trigger finish context, etc.)
   mds->mdlog->submit_entry(le, new C_MDS_ExportFinishLogged(this, dir));
   mds->mdlog->flush();
-  ceph_assert(g_conf()->mds_kill_export_at != 10);
 }
 
 void Migrator::export_notify_abort(CDir *dir, export_state_t& stat, set<CDir*>& bounds)