]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/ConfigMonitor: only propose if leader 33155/head
authorSage Weil <sage@redhat.com>
Wed, 29 Jan 2020 23:18:04 +0000 (17:18 -0600)
committerShyukri Shyukriev <shshyukriev@suse.com>
Sat, 8 Feb 2020 21:47:01 +0000 (23:47 +0200)
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)

src/mon/ConfigMonitor.cc

index 3e08b8a49f0ca2c797f4ad5bfefd41d7e4e52b3d..ccfff04c09c9d772a4f6122da77b55e06b21bfc0 100644 (file)
@@ -678,7 +678,7 @@ update:
 
 void ConfigMonitor::tick()
 {
-  if (!is_active()) {
+  if (!is_active() || !mon->is_leader()) {
     return;
   }
   dout(10) << __func__ << dendl;