mon: forgot paxos_pgmap

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 88e61efc8ec996d6509a3c0e9df8c3f58a7bb2cc..350fc5f0461b07ffe43d4fb0fdc63bf2c773b5e6 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -146,6 +146,7 @@ void Monitor::call_election()
   paxos_mdsmap.election_starting();
   paxos_osdmap.election_starting();
   paxos_clientmap.election_starting();
+  paxos_pgmap.election_starting();
   
   // call a new election
   elector.call_election();

diff --git a/src/mon/Paxos.cc b/src/mon/Paxos.cc
index 2af1488bde7be11b81ad135ed2876dce2f60e439..73c6a9c439e83affb670baccb83aaffb1b5b91eb 100644 (file)
--- a/src/mon/Paxos.cc
+++ b/src/mon/Paxos.cc
@@ -671,11 +671,11 @@ void Paxos::cancel_events()
 
 void Paxos::leader_init()
 {
+  cancel_events();
   if (mon->get_quorum().size() == 1) {
     state = STATE_ACTIVE;                          
     return;
   } 
-  cancel_events();
   state = STATE_RECOVERING;
   lease_expire = utime_t();
   dout(10) << "leader_init -- starting paxos recovery" << dendl;