]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon: update assert for looser requirements
authorGreg Farnum <greg@inktank.com>
Fri, 26 Apr 2013 22:09:50 +0000 (15:09 -0700)
committerSage Weil <sage@inktank.com>
Fri, 26 Apr 2013 22:24:05 +0000 (15:24 -0700)
Signed-off-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
src/mon/Elector.cc

index 122fe48846b37f4535959f70a48de3ab0143fbdf..eed2d40e901733e6010d60c031e9d55fc8656e1d 100644 (file)
@@ -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;