From: Yan, Zheng <zheng.z.yan@intel.com>
Date: Wed, 6 Nov 2013 02:31:06 +0000 (+0800)
Subject: mds: process delayed expire if exporting dir cancelled in warnning state
X-Git-Tag: v0.75~93^2~31
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=498d5c499842d7ce87e597eeaa89e8818920e123;p=ceph.git

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 c57f0ca28ec8..7f5ae677afce 100644
--- 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());