From: Greg Farnum <greg@inktank.com>
Date: Fri, 26 Apr 2013 22:09:50 +0000 (-0700)
Subject: mon: update assert for looser requirements
X-Git-Tag: v0.61~71
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1e6f02b337767012aeb387da9582cd7ad5a03084;p=ceph.git

mon: update assert for looser requirements

Signed-off-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/mon/Elector.cc b/src/mon/Elector.cc
index 122fe48846b3..eed2d40e9017 100644
--- a/src/mon/Elector.cc
+++ b/src/mon/Elector.cc
@@ -286,7 +286,7 @@ void Elector::handle_victory(MMonElection *m)
   dout(5) << "handle_victory from " << m->get_source() << " quorum_features " << m->quorum_features << dendl;
   int from = m->get_source().num();
 
-  assert(from < mon->rank);
+  assert((from < mon->rank) || (acked_first_paxos_version > mon->paxos->get_version()));
   assert(m->epoch % 2 == 0);  
 
   leader_acked = -1;