From: Greg Farnum <gfarnum@redhat.com>
Date: Thu, 30 Jan 2020 12:43:13 +0000 (-0800)
Subject: mon: elector: return after triggering a new election
X-Git-Tag: v14.2.8~29^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9155cdf1875a3ad3fb991bafc46399efa9dcc61c;p=ceph.git

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 <gfarnum@redhat.com>
(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
---

diff --git a/src/mon/Elector.cc b/src/mon/Elector.cc
index 9558809e4294..1e3646050f30 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) {