]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
librados: shut down monclient after objecter
authorSage Weil <sage@redhat.com>
Fri, 15 Aug 2014 22:31:16 +0000 (15:31 -0700)
committerJohn Spray <john.spray@redhat.com>
Mon, 25 Aug 2014 00:34:19 +0000 (01:34 +0100)
The objecter ms_handle_reset may call into monc; shut objecter down first.

Fixes: #9130
Signed-off-by: Sage Weil <sage@redhat.com>
src/librados/RadosClient.cc

index bf964648c7635ac658011cf09ecdd467e73295d4..9ccefc60fdf16ab564022ce4913e8dbed1edb51f 100644 (file)
@@ -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();