summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-06-13 14:42:03 -0700
committerSage Weil <sage@inktank.com>2013-06-13 14:42:03 -0700
commit7e1cf87b5158c870e2a118ed6d316be8cb9818ce (patch)
treeab330157e15255af562d632b586da043f49ec402
parent35ea1639aa72728c043d87541618d9c0dff3baec (diff)
downloadceph-7e1cf87b5158c870e2a118ed6d316be8cb9818ce.tar.gz
librados: do not wait for osdmap on start
If we abort while waiting, we incorrect clean up (we switch the state value incorrectly, and also fail to clean up the initialized objecter). Intead, skip this wait.. it's useless! Signed-off-by: Sage Weil <sage@inktank.com> Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
-rw-r--r--src/librados/RadosClient.cc5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/librados/RadosClient.cc b/src/librados/RadosClient.cc
index 3b5fabe3f82..f5dccaffc09 100644
--- a/src/librados/RadosClient.cc
+++ b/src/librados/RadosClient.cc
@@ -201,11 +201,6 @@ int librados::RadosClient::connect()
objecter->init_locked();
monclient.renew_subs();
- while (osdmap.get_epoch() == 0) {
- ldout(cct, 1) << "waiting for osdmap" << dendl;
- cond.Wait(lock);
- }
-
finisher.start();
state = CONNECTED;