mon/MgrMonitor: do not tick() if not active or leader

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc
index 3e59d0ecb3694593147ee527b0755f5c42a714c1..39a80a466498d1bcf75ac93524ea9b2696797a5f 100644 (file)
--- a/src/mon/MgrMonitor.cc
+++ b/src/mon/MgrMonitor.cc
@@ -299,6 +299,9 @@ void MgrMonitor::send_digests()
 
 void MgrMonitor::tick()
 {
+  if (!is_active() || !mon->is_leader())
+    return;
+
   const utime_t now = ceph_clock_now();
   utime_t cutoff = now;
   cutoff -= g_conf->mon_mgr_beacon_grace;