]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
librados: fix unitialized timeout in wait_for_osdmap 24721/head
authorCasey Bodley <cbodley@redhat.com>
Tue, 23 Oct 2018 19:10:12 +0000 (15:10 -0400)
committerCasey Bodley <cbodley@redhat.com>
Tue, 23 Oct 2018 22:51:40 +0000 (18:51 -0400)
Signed-off-by: Casey Bodley <cbodley@redhat.com>
src/librados/RadosClient.cc

index cac911e23eb965eb2ba91f3fd85e30a7946514e6..ec7010e487e4b20c313c01c1ee378cdc4a8e1e00 100644 (file)
@@ -581,14 +581,13 @@ int librados::RadosClient::wait_for_osdmap()
   if (need_map) {
     std::lock_guard l(lock);
 
-    ceph::timespan timeout;
+    ceph::timespan timeout{0};
     if (cct->_conf->rados_mon_op_timeout > 0) {
       timeout = ceph::make_timespan(cct->_conf->rados_mon_op_timeout);
     }
 
     if (objecter->with_osdmap(std::mem_fn(&OSDMap::get_epoch)) == 0) {
       ldout(cct, 10) << __func__ << " waiting" << dendl;
-      auto start = mono_clock::now();
       while (objecter->with_osdmap(std::mem_fn(&OSDMap::get_epoch)) == 0) {
         if (timeout == timeout.zero()) {
           cond.Wait(lock);