]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
librados: do not wait for osdmap on start
authorSage Weil <sage@inktank.com>
Thu, 13 Jun 2013 21:42:03 +0000 (14:42 -0700)
committerSage Weil <sage@inktank.com>
Thu, 13 Jun 2013 21:42:03 +0000 (14:42 -0700)
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>
src/librados/RadosClient.cc

index 3b5fabe3f829b5e2e9c5ada2395e06f4fc98190c..f5dccaffc095e9f2b1e886a49a50dfa83136ad1b 100644 (file)
@@ -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;