]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
mon: elector: return after triggering a new election 33007/head
authorGreg Farnum <gfarnum@redhat.com>
Thu, 30 Jan 2020 12:43:13 +0000 (04:43 -0800)
committerNathan Cutler <ncutler@suse.com>
Fri, 31 Jan 2020 09:45:27 +0000 (10:45 +0100)
commit9155cdf1875a3ad3fb991bafc46399efa9dcc61c
treecd6e8c59d8dad425a9a0a4cb2c1b1744aa1a05c9
parent3099d97a84ec22898ace5d7c4ae890571e0431c7
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
src/mon/Elector.cc