mds: process delayed expire if exporting dir cancelled in warnning state

we may add delayed expire when exporting dir is in warnning state

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>

diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc
index c57f0ca28ec8b37b6f8beda995189858d70c418d..7f5ae677afce54178a895990f4ea9087e67a0385 100644 (file)
--- a/src/mds/Migrator.cc
+++ b/src/mds/Migrator.cc
@@ -277,9 +277,12 @@ void Migrator::export_try_cancel(CDir *dir)
         bd->put(CDir::PIN_EXPORTBOUND);
         bd->state_clear(CDir::STATE_EXPORTBOUND);
       }
-      // notify bystanders
-      if (state == EXPORT_WARNING)
-        export_notify_abort(dir, bounds);
+      if (state == EXPORT_WARNING) {
+       // notify bystanders
+       export_notify_abort(dir, bounds);
+       // process delayed expires
+       cache->process_delayed_expire(dir);
+      }
     }
     dir->unfreeze_tree();
     cache->adjust_subtree_auth(dir, mds->get_nodeid());