From 3f95cef9fabdd42ccddfb177edf41501e5301994 Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Fri, 9 Oct 2009 16:02:20 -0700 Subject: [PATCH] mon: Remove invalid assert; fix mon_type constants. --- src/mon/MonmapMonitor.cc | 2 +- src/mon/mon_types.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc index 0c7d0caca96..b55005e92ec 100644 --- a/src/mon/MonmapMonitor.cc +++ b/src/mon/MonmapMonitor.cc @@ -72,7 +72,7 @@ void MonmapMonitor::encode_pending(bufferlist& bl) { dout(10) << "encode_pending epoch " << pending_map.epoch << dendl; - assert(paxos->get_version() + 1 == pending_map.epoch); + assert(mon->monmap->epoch + 1 == pending_map.epoch); pending_map.encode(bl); } diff --git a/src/mon/mon_types.h b/src/mon/mon_types.h index 4a9bfcf7124..80b59f4a268 100644 --- a/src/mon/mon_types.h +++ b/src/mon/mon_types.h @@ -21,8 +21,8 @@ #define PAXOS_CLIENTMAP 3 #define PAXOS_LOG 4 #define PAXOS_CLASS 5 -#define PAXOS_NUM 6 -#define PAXOS_MONMAP 7 +#define PAXOS_MONMAP 6 +#define PAXOS_NUM 7 inline const char *get_paxos_name(int p) { switch (p) { -- 2.47.3