From dfc46f5ef380aa15bc4a0bbbc29e5b7e143e83ba Mon Sep 17 00:00:00 2001 From: Henry C Chang Date: Thu, 14 Oct 2010 19:57:02 +0800 Subject: [PATCH] mon: do not assert if paxosv < monmap->epoch Signed-off-by: Sage Weil --- src/mon/MonmapMonitor.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc index fab922be690d0..fc8be4f724a42 100644 --- a/src/mon/MonmapMonitor.cc +++ b/src/mon/MonmapMonitor.cc @@ -42,8 +42,8 @@ bool MonmapMonitor::update_from_paxos() { //check versions to see if there's an update version_t paxosv = paxos->get_version(); - if (paxosv == mon->monmap->epoch) return true; - assert(paxosv >= mon->monmap->epoch); + if (paxosv <= mon->monmap->epoch) return true; + //assert(paxosv >= mon->monmap->epoch); dout(10) << "update_from_paxos paxosv " << paxosv << ", my v " << mon->monmap->epoch << dendl; -- 2.39.5