mon: Remove invalid assert; fix mon_type constants.

diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc
index 0c7d0caca96a6701d9bffb3151bb13d17b8720b6..b55005e92ec62e3f033b761e08f6f748cc12bbec 100644 (file)
--- 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 4a9bfcf7124360f6fc1658ebd427e697cab3a99b..80b59f4a2689ff0191913deadf40081d3e1dd59b 100644 (file)
--- 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) {