From: Sage Weil <sage@redhat.com>
Date: Tue, 5 Apr 2016 13:58:02 +0000 (-0400)
Subject: mon/OSDMonitor: fix off-by-one for osd_map_message_max
X-Git-Tag: v10.1.2~36^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bc9607b80080156c401cee60a6d6a962efe88e85;p=ceph.git

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 8114154e2ef0..a3886686e967 100644
--- 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) {