From: Sage Weil <sage@redhat.com>
Date: Wed, 22 Mar 2017 16:41:11 +0000 (-0500)
Subject: mon/MgrMonitor: do not tick() if not active or leader
X-Git-Tag: v12.0.2~252^2~6
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=79bf5547cc49b897e285c617e2921c773e625090;p=ceph-ci.git

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 3e59d0ecb36..39a80a46649 100644
--- 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;