From d00b4cd78364a77c4e3b1f986fcb07b45d38f398 Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Tue, 30 Apr 2013 13:21:28 -0700 Subject: [PATCH] Revert "mon: update assert for looser requirements" 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 --- src/mon/Elector.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mon/Elector.cc b/src/mon/Elector.cc index 32d78b4eb4b..b9a7031848b 100644 --- a/src/mon/Elector.cc +++ b/src/mon/Elector.cc @@ -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;