paxosservice: tolerate _active() call when not active

This can happen when multiple C_Active events are queued, and the first
does a propose_pending() (moving us into updating state).

Signed-off-by: Sage Weil <sage@newdream.net>

1 files changed, 5 insertions, 1 deletions

diff --git a/src/mon/PaxosService.cc b/src/mon/PaxosService.cc
index bcba8e98afb..399fd071977 100644
--- a/src/mon/PaxosService.cc
+++ b/src/mon/PaxosService.cc
@@ -156,8 +156,12 @@ void PaxosService::election_finished()
 
 void PaxosService::_active()
 {
+  if (!paxos->is_active()) {
+    dout(10) << "_active - not active" << dendl;
+    paxos->wait_for_active(new C_Active(this));
+    return;
+  }
   dout(10) << "_active" << dendl;
-  assert(paxos->is_active());
 
   // pull latest from paxos
   update_from_paxos();