From fba2a0dd5984bd894ad3029be818f937d82846d8 Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Wed, 10 Jul 2019 10:51:31 -0700 Subject: [PATCH] elector: swap order of parameters in ElectionLogic::receive_propose Signed-off-by: Greg Farnum --- src/mon/ElectionLogic.cc | 2 +- src/mon/ElectionLogic.h | 2 +- src/mon/Elector.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mon/ElectionLogic.cc b/src/mon/ElectionLogic.cc index 1c4c01d4e9ca6..51c81598d4bc8 100644 --- a/src/mon/ElectionLogic.cc +++ b/src/mon/ElectionLogic.cc @@ -132,7 +132,7 @@ void ElectionLogic::declare_victory() elector->message_victory(new_quorum); } -void ElectionLogic::receive_propose(epoch_t mepoch, int from) +void ElectionLogic::receive_propose(int from, epoch_t mepoch) { if (mepoch > epoch) { bump_epoch(mepoch); diff --git a/src/mon/ElectionLogic.h b/src/mon/ElectionLogic.h index 0d60115a6c871..f146d055dd86f 100644 --- a/src/mon/ElectionLogic.h +++ b/src/mon/ElectionLogic.h @@ -229,7 +229,7 @@ public: * @param mepoch The epoch of the proposal * @param from The rank proposing itself as leader */ - void receive_propose(epoch_t mepoch, int from); + void receive_propose(int from, epoch_t mepoch); /** * Handle a message from some other participant Acking us as the Leader. * diff --git a/src/mon/Elector.cc b/src/mon/Elector.cc index e3eb3bd118cb8..7268197c60503 100644 --- a/src/mon/Elector.cc +++ b/src/mon/Elector.cc @@ -247,7 +247,7 @@ void Elector::handle_propose(MonOpRequestRef op) << dendl; nak_old_peer(op); } - logic.receive_propose(m->epoch, from); + logic.receive_propose(from, m->epoch); } void Elector::handle_ack(MonOpRequestRef op) -- 2.39.5