mds: shut down finisher before objecter

Some of the finisher contexts would try to call into Objecter.
We mostly are protected from this by mds_lock+the stopping
flag, but at the Filer level there's no mds_lock, so in the
case of file size probing we have a problem.

Fixes: http://tracker.ceph.com/issues/19204
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 177a97d5c55ee6a2d5dcd3cf0893546190b10f7a)

Conflicts:
        src/mds/MDSRank.cc (no purge_queue.shutdown() in jewel because jewel
        does not have 8ebf7d95a9071de24bb1e56a6423c505169cb4de)

diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc
index 728af772bae6a6cd5710b25aa6d4cc7f1bfe5dfb..d050afe955b534f5c973e0831f729fad044f6de3 100644 (file)
--- a/src/mds/MDSRank.cc
+++ b/src/mds/MDSRank.cc
@@ -228,6 +228,10 @@ void MDSRankDispatcher::shutdown()
   // shut down cache
   mdcache->shutdown();
 
+  mds_lock.Unlock();
+  finisher->stop(); // no flushing
+  mds_lock.Lock();
+
   if (objecter->initialized.read())
     objecter->shutdown();
 
@@ -241,7 +245,6 @@ void MDSRankDispatcher::shutdown()
   // MDSDaemon::ms_handle_reset called from Messenger).
   mds_lock.Unlock();
 
-  finisher->stop(); // no flushing
   messenger->shutdown();
 
   mds_lock.Lock();