From 5df9aad20db71e11db66df27554d8ff78629ad6a Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Tue, 23 Oct 2018 15:10:12 -0400 Subject: [PATCH] librados: fix unitialized timeout in wait_for_osdmap Signed-off-by: Casey Bodley --- src/librados/RadosClient.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/librados/RadosClient.cc b/src/librados/RadosClient.cc index cac911e23eb96..ec7010e487e4b 100644 --- a/src/librados/RadosClient.cc +++ b/src/librados/RadosClient.cc @@ -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); -- 2.39.5