From 9155cdf1875a3ad3fb991bafc46399efa9dcc61c Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Thu, 30 Jan 2020 04:43:13 -0800 Subject: [PATCH] mon: elector: return after triggering a new election When receiving an old propose, we were correctly triggering a new election but not then returning out of receive_propose(), so we processed the "should I defer" logic and perhaps sent out a deferal (in the current epoch!). Fixes: https://tracker.ceph.com/issues/42977 Signed-off-by: Greg Farnum (cherry picked from commit 337d12ba802d5b31db36be25c3349b9b67ec17ba) Conflicts: src/mon/ElectionLogic.cc - file does not exist in nautilus: made the change manually in src/mon/Elector.cc --- src/mon/Elector.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mon/Elector.cc b/src/mon/Elector.cc index 9558809e429..1e3646050f3 100644 --- a/src/mon/Elector.cc +++ b/src/mon/Elector.cc @@ -288,8 +288,8 @@ void Elector::handle_propose(MonOpRequestRef op) mon->start_election(); } else { dout(5) << " ignoring old propose" << dendl; - return; } + return; } if (mon->rank < from) { -- 2.47.3