]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
librados: rectify the guard in RadosClient::wait_for_osdmap(). 3513/head
authorRadoslaw Zarzynski <rzarzynski@mirantis.com>
Thu, 29 Jan 2015 17:19:16 +0000 (18:19 +0100)
committerRadoslaw Zarzynski <rzarzynski@mirantis.com>
Sun, 1 Feb 2015 20:37:02 +0000 (21:37 +0100)
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>
src/librados/RadosClient.cc

index 6f349f5571969c45d846d08799b27c95c27b6dd9..020c880ace0b58eb7cdb9f9d7c847e6343ffef12 100644 (file)
@@ -434,7 +434,7 @@ int librados::RadosClient::wait_for_osdmap()
 {
   assert(!lock.is_locked_by_me());
 
-  if (objecter == NULL) {
+  if (state != CONNECTED) {
     return -ENOTCONN;
   }