mon/Elector: cancel election timer if we bootstrap

If we short-circuit and bootstrap, cancel our timer.  Otherwise it will
go off some time later when we are in who knows what state.

Backport: cuttlefish
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>

diff --git a/src/mon/Elector.cc b/src/mon/Elector.cc
index b3db1afab3cea4b9df2d3ca66ffb40ba5f725f95..7172510d807c06c34f841133f9e981c0ff815bd6 100644 (file)
--- a/src/mon/Elector.cc
+++ b/src/mon/Elector.cc
@@ -346,6 +346,7 @@ void Elector::dispatch(Message *m)
         t.put("monmap", "last_committed", mon->monmap->epoch);
         mon->store->apply_transaction(t);
        //mon->monmon()->paxos->stash_latest(mon->monmap->epoch, em->monmap_bl);
+       cancel_timer();
        mon->bootstrap();
        m->put();
        delete peermap;