From: Sage Weil <sage@redhat.com>
Date: Wed, 29 Jan 2020 23:18:04 +0000 (-0600)
Subject: mon/ConfigMonitor: only propose if leader
X-Git-Tag: v14.2.8~24^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4b60c0ef4d0f9b876a2ed0a73738a8112f82c827;p=ceph.git

mon/ConfigMonitor: only propose if leader

Introduced by 08fcf01c040e0caaf5b418d300f774bf8c3033da, which activated
this (broken) code path.

Fixes: https://tracker.ceph.com/issues/43892
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit ab64a220ccf78d632114f7041e6344aaccf6b359)
---

diff --git a/src/mon/ConfigMonitor.cc b/src/mon/ConfigMonitor.cc
index 3e08b8a49f0c..ccfff04c09c9 100644
--- a/src/mon/ConfigMonitor.cc
+++ b/src/mon/ConfigMonitor.cc
@@ -678,7 +678,7 @@ update:
 
 void ConfigMonitor::tick()
 {
-  if (!is_active()) {
+  if (!is_active() || !mon->is_leader()) {
     return;
   }
   dout(10) << __func__ << dendl;