From 4a40c1acd371544b35ba18b973e46b26a4b13930 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sun, 24 Jul 2011 14:22:12 -0700 Subject: [PATCH] mds: submit_entry last MDLog::submit_entry() may journal an ESubtreeMap as a side-effect, so make sure we have updated our state correctly _before_ calling it. The safest is to just do it last. Signed-off-by: Sage Weil --- src/mds/Migrator.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc index d25d77b702aa2..c2146c19759bc 100644 --- a/src/mds/Migrator.cc +++ b/src/mds/Migrator.cc @@ -1912,15 +1912,15 @@ void Migrator::handle_export_dir(MExportDir *m) dout(7) << "handle_export_dir did " << *dir << dendl; + // note state + import_state[dir->dirfrag()] = IMPORT_LOGGINGSTART; + assert (g_conf->mds_kill_import_at != 6); + // log it mds->mdlog->submit_entry(le); mds->mdlog->wait_for_safe(onlogged); mds->mdlog->flush(); - // note state - import_state[dir->dirfrag()] = IMPORT_LOGGINGSTART; - assert (g_conf->mds_kill_import_at != 6); - // some stats if (mds->logger) { mds->logger->inc(l_mds_im); -- 2.39.5