From 34473f78f101d87d2606e0e7112682a47ff24830 Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Thu, 29 Jan 2015 18:19:16 +0100 Subject: [PATCH] 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 --- src/librados/RadosClient.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } -- 2.47.3