Merge pull request #20004 from mogeb/steady-clock-tools-rados

librados: use steady clock for rados_mon_op_timeout

Reviewed-by: Kefu Chai <kchai@redhat.com>

diff --cc src/librados/RadosClient.cc
index 3245892cd11c6949e47ec849253ad7a410dc6220,f08883760eb19f0655d6846702b1fef91c34f48f..cac911e23eb965eb2ba91f3fd85e30a7946514e6
--- 1/src/librados/RadosClient.cc
--- 2/src/librados/RadosClient.cc
+++ b/src/librados/RadosClient.cc
@@@ -579,11 -583,12 +579,12 @@@ int librados::RadosClient::wait_for_osd
      });
  
    if (need_map) {
 -    Mutex::Locker l(lock);
 +    std::lock_guard l(lock);
  
-     utime_t timeout;
-     if (cct->_conf->rados_mon_op_timeout > 0)
-       timeout.set_from_double(cct->_conf->rados_mon_op_timeout);
+     ceph::timespan timeout;
+     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;

diff --cc src/librados/RadosClient.h
Simple merge