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 - kraken has no 7189b53b410424d4a662486c1081181b2bd662ff
        so we omit the purge_queue.shutdown() call

diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc
index 63ad51bd9567073f024b1539d190c4e94f291251..c8900cdf3c443795ddc9e700b59bfc413797cc7c 100644 (file)
--- a/src/mds/MDSRank.cc
+++ b/src/mds/MDSRank.cc
@@ -238,6 +238,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();
 
@@ -251,8 +255,6 @@ void MDSRankDispatcher::shutdown()
   // MDSDaemon::ms_handle_reset called from Messenger).
   mds_lock.Unlock();
 
-  finisher->stop(); // no flushing
-
   // shut down messenger
   messenger->shutdown();