From: Sage Weil <sage@redhat.com>
Date: Fri, 15 Aug 2014 22:31:16 +0000 (-0700)
Subject: librados: shut down monclient after objecter
X-Git-Tag: v0.86~213^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6baf36f90fb1851995bedf5527766a2d5ac77e05;p=ceph.git

librados: shut down monclient after objecter

The objecter ms_handle_reset may call into monc; shut objecter down first.

Fixes: #9130
Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/librados/RadosClient.cc b/src/librados/RadosClient.cc
index bf964648c763..9ccefc60fdf1 100644
--- a/src/librados/RadosClient.cc
+++ b/src/librados/RadosClient.cc
@@ -298,9 +298,9 @@ void librados::RadosClient::shutdown()
   instance_id = 0;
   timer.shutdown();   // will drop+retake lock
   lock.Unlock();
-  monclient.shutdown();
   if (need_objecter)
     objecter->shutdown();
+  monclient.shutdown();
   if (messenger) {
     messenger->shutdown();
     messenger->wait();