From 337d12ba802d5b31db36be25c3349b9b67ec17ba 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 --- src/mon/ElectionLogic.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mon/ElectionLogic.cc b/src/mon/ElectionLogic.cc index 51c81598d4bc8..f6e4622bb0ad8 100644 --- a/src/mon/ElectionLogic.cc +++ b/src/mon/ElectionLogic.cc @@ -147,8 +147,8 @@ void ElectionLogic::receive_propose(int from, epoch_t mepoch) elector->trigger_new_election(); } else { ldout(cct, 5) << " ignoring old propose" << dendl; - return; } + return; } if (elector->get_my_rank() < from) { -- 2.39.5