From: Sage Weil <sage@newdream.net>
Date: Mon, 30 Jun 2008 22:55:07 +0000 (-0700)
Subject: mon: forgot paxos_pgmap
X-Git-Tag: v0.3~36
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f44310503aeda0b751d10718a8f68356a8f6681d;p=ceph.git

mon: forgot paxos_pgmap
---

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 88e61efc8ec9..350fc5f0461b 100644
--- 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 2af1488bde7b..73c6a9c439e8 100644
--- 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;