mds: stop purging strays when mds is being shutdown

Fixes: http://tracker.ceph.com/issues/18717
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>

diff --git a/src/mds/StrayManager.cc b/src/mds/StrayManager.cc
index 0cc668f35a03b64b5f100165da1469b02c7ae60c..47cee6341475ebadaed7927a5aedfbcd9e368423 100644 (file)
--- a/src/mds/StrayManager.cc
+++ b/src/mds/StrayManager.cc
@@ -318,6 +318,11 @@ void StrayManager::_purge_stray_logged(CDentry *dn, version_t pdv, LogSegment *l
 
 void StrayManager::enqueue(CDentry *dn, bool trunc)
 {
+  if (aborted) {
+    dout(10) << __func__ << ": aborted, skip purging: " << *dn << dendl;
+    return;
+  }
+
   CDentry::linkage_t *dnl = dn->get_projected_linkage();
   assert(dnl);
   CInode *in = dnl->get_inode();
@@ -372,6 +377,9 @@ public:
 
 void StrayManager::_advance()
 {
+  if (aborted)
+    return;
+
   std::map<CDir*, std::set<dentry_key_t> > to_fetch;
 
   for (auto p = ready_for_purge.begin();
@@ -850,7 +858,7 @@ void StrayManager::migrate_stray(CDentry *dn, mds_rank_t to)
 
 StrayManager::StrayManager(MDSRank *mds)
   : delayed_eval_stray(member_offset(CDentry, item_stray)),
-    mds(mds), logger(NULL), started(false),
+    mds(mds), logger(NULL), started(false), aborted(false),
     ops_in_flight(0), files_purging(0),
     max_purge_ops(0), 
     num_strays(0), num_strays_purging(0), num_strays_delayed(0),
@@ -886,6 +894,8 @@ void StrayManager::abort_queue()
 
   trimmed_strays.clear();
   fetching_strays.clear();
+
+  aborted = true;
 }
 
 void StrayManager::truncate(CDentry *dn, uint32_t op_allowance)
@@ -992,6 +1002,9 @@ void StrayManager::notify_stray_loaded(CDentry *dn)
   if (in->inode.nlink == 0)
     in->state_set(CInode::STATE_ORPHAN);
 
+  if (aborted)
+    return;
+
   auto p = trimmed_strays.find(dn->name);
   if (p != trimmed_strays.end()) {
     dn->state_set(CDentry::STATE_PURGING);
@@ -1011,5 +1024,8 @@ void StrayManager::notify_stray_trimmed(CDentry *dn)
 {
   dout(10) << __func__ << ": " << *dn << dendl;
 
+  if (aborted)
+    return;
+
   trimmed_strays.insert(dn->name);
 }

diff --git a/src/mds/StrayManager.h b/src/mds/StrayManager.h
index 892890b1644708984269ffc7bc28bbd1391d7977..d58ebfbbd73b555a59dc5009d95d5f68e935bdc4 100644 (file)
--- a/src/mds/StrayManager.h
+++ b/src/mds/StrayManager.h
@@ -56,6 +56,7 @@ class StrayManager
   PerfCounters *logger;
 
   bool started;
+  bool aborted;
 
   // Throttled allowances
   uint64_t ops_in_flight;