]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Revert "mon: update assert for looser requirements"
authorGreg Farnum <greg@inktank.com>
Tue, 30 Apr 2013 20:21:28 +0000 (13:21 -0700)
committerGreg Farnum <greg@inktank.com>
Tue, 30 Apr 2013 20:50:40 +0000 (13:50 -0700)
We reverted the gating by paxos sequences, so now we don't
need to look at them at all.

This reverts commit 1e6f02b337767012aeb387da9582cd7ad5a03084.
Signed-off-by: Greg Farnum <greg@inktank.com>
src/mon/Elector.cc

index 32d78b4eb4b8007f37a7941f492825586e624ce9..b9a7031848b737b67068b1c2427c5505ffb40a6c 100644 (file)
@@ -271,7 +271,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) || (acked_first_paxos_version > mon->paxos->get_version()));
+  assert(from < mon->rank);
   assert(m->epoch % 2 == 0);  
 
   leader_acked = -1;