From: John Spray <john.spray@redhat.com>
Date: Wed, 13 Aug 2014 01:19:22 +0000 (+0100)
Subject: librados: update Objecter shutdown
X-Git-Tag: v0.86~213^2~25
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=545baf858256db1b6e4064c82ab4c39841e135c4;p=ceph.git

librados: update Objecter shutdown

Previously checking for CONNECTED was equivalent to
checking the objecter had been initialized, but since
the separation between init() and start() that is
no longer the case.  Avoid the need to be smart by
just readint Objecter::initialized to learn whether
to call Objecter::shutdown

Fixes: #9067

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/librados/RadosClient.cc b/src/librados/RadosClient.cc
index f59cca963cef4..7fddcdebd03a5 100644
--- a/src/librados/RadosClient.cc
+++ b/src/librados/RadosClient.cc
@@ -280,7 +280,7 @@ void librados::RadosClient::shutdown()
     finisher.stop();
   }
   bool need_objecter = false;
-  if (objecter && state == CONNECTED) {
+  if (objecter && objecter->initialized.read()) {
     need_objecter = true;
   }
   state = DISCONNECTED;