From: Greg Farnum <greg@inktank.com>
Date: Tue, 30 Apr 2013 20:21:28 +0000 (-0700)
Subject: Revert "mon: update assert for looser requirements"
X-Git-Tag: v0.61~29^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d00b4cd78364a77c4e3b1f986fcb07b45d38f398;p=ceph.git

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 <greg@inktank.com>
---

diff --git a/src/mon/Elector.cc b/src/mon/Elector.cc
index 32d78b4eb4b8..b9a7031848b7 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;