From 27438db5fa088c7f0c25ee99f90dcb04ab892bbd Mon Sep 17 00:00:00 2001 From: "Yan, Zheng" Date: Thu, 14 Mar 2013 12:01:08 +0800 Subject: [PATCH] mds: unfreeze subtree if import aborts in PREPPED state Signed-off-by: Yan, Zheng Reviewed-by: Greg Farnum --- src/mds/Migrator.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc index e1cb08f1da0a8..e67c59f7af3af 100644 --- a/src/mds/Migrator.cc +++ b/src/mds/Migrator.cc @@ -1658,11 +1658,14 @@ void Migrator::handle_export_cancel(MExportDirCancel *m) CInode *in = cache->get_inode(df.ino); assert(in); import_reverse_discovered(df, in); - } else if (import_state[df] == IMPORT_PREPPING || - import_state[df] == IMPORT_PREPPED) { + } else if (import_state[df] == IMPORT_PREPPING) { CDir *dir = mds->mdcache->get_dirfrag(df); assert(dir); import_reverse_prepping(dir); + } else if (import_state[df] == IMPORT_PREPPED) { + CDir *dir = mds->mdcache->get_dirfrag(df); + assert(dir); + import_reverse_unfreeze(dir); } else { assert(0 == "got export_cancel in weird state"); } -- 2.39.5