update sources to v12.1.2

[ceph.git] / ceph / src / tools / rbd_mirror / LeaderWatcher.cc

diff --git a/ceph/src/tools/rbd_mirror/LeaderWatcher.cc b/ceph/src/tools/rbd_mirror/LeaderWatcher.cc
index ca0783679baeed18331f7a0b48d2947e53db95c5..9e99d6b6f6e8beb96c2b1b68f2fef9c83716c874 100644 (file)
--- a/ceph/src/tools/rbd_mirror/LeaderWatcher.cc
+++ b/ceph/src/tools/rbd_mirror/LeaderWatcher.cc
@@ -370,8 +370,7 @@ void LeaderWatcher<I>::schedule_timer_task(const std::string &name,
       m_timer_gate->timer_callback = timer_callback;
     });
 
-  int after = delay_factor *
-    max(1, m_cct->_conf->rbd_mirror_leader_heartbeat_interval);
+  int after = delay_factor * m_cct->_conf->rbd_mirror_leader_heartbeat_interval;
 
   dout(20) << "scheduling " << name << " after " << after << " sec (task "
            << m_timer_task << ")" << dendl;