summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Farnum <greg@inktank.com>2013-04-26 15:09:50 -0700
committerSage Weil <sage@inktank.com>2013-04-26 15:24:05 -0700
commit1e6f02b337767012aeb387da9582cd7ad5a03084 (patch)
treeafbbf1e9b569ffabb9481727b65be40244ba8a7f
parentba13173b7fb6a7a71a348ba91f418cd2f0e11001 (diff)
downloadceph-1e6f02b337767012aeb387da9582cd7ad5a03084.tar.gz
mon: update assert for looser requirements
Signed-off-by: Greg Farnum <greg@inktank.com> Reviewed-by: Sage Weil <sage@inktank.com>
-rw-r--r--src/mon/Elector.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mon/Elector.cc b/src/mon/Elector.cc
index 122fe48846b..eed2d40e901 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;