From: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Date: Thu, 29 Jan 2015 17:19:16 +0000 (+0100)
Subject: librados: rectify the guard in RadosClient::wait_for_osdmap().
X-Git-Tag: v0.93~51^2~1^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=34473f78f101d87d2606e0e7112682a47ff24830;p=ceph.git

librados: rectify the guard in RadosClient::wait_for_osdmap().

RadosClient::wait_for_osdmap() did not signalize lack of connection
via -ENOTCONN error code when the Objecter instance was allocated.
The proper way is to check the connection state explicitly.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
---

diff --git a/src/librados/RadosClient.cc b/src/librados/RadosClient.cc
index 6f349f557196..020c880ace0b 100644
--- a/src/librados/RadosClient.cc
+++ b/src/librados/RadosClient.cc
@@ -434,7 +434,7 @@ int librados::RadosClient::wait_for_osdmap()
 {
   assert(!lock.is_locked_by_me());
 
-  if (objecter == NULL) {
+  if (state != CONNECTED) {
     return -ENOTCONN;
   }