mon/OSDMonitor: fix off-by-one for osd_map_message_max

For most messages we were sending osd_map_message_max + 1 maps.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 8114154e2ef0d9f6867a80a2e478548ef528a086..a3886686e967ea39a5df57cf39113e3db9ff3148 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -2564,7 +2564,8 @@ void OSDMonitor::send_incremental(epoch_t first,
   }
 
   while (first <= osdmap.get_epoch()) {
-    epoch_t last = MIN(first + g_conf->osd_map_message_max, osdmap.get_epoch());
+    epoch_t last = MIN(first + g_conf->osd_map_message_max - 1,
+                      osdmap.get_epoch());
     MOSDMap *m = build_incremental(first, last);
 
     if (req) {