From: Matan Breizman <mbreizma@redhat.com>
Date: Thu, 16 Nov 2023 11:06:56 +0000 (+0000)
Subject: osd/OSD: send_incremental_map pass correct send_from
X-Git-Tag: v19.1.0~604^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a88f039d9bc6baf0f71a0c409b18e13694c9173a;p=ceph.git

osd/OSD: send_incremental_map pass correct send_from

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index d4b1fa6709925..d4629630a41b7 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1402,7 +1402,7 @@ MOSDMap *OSDService::build_incremental_map_msg(epoch_t since, epoch_t to,
     max_bytes -= bl.length();
     m->maps[since] = std::move(bl);
   }
-  for (epoch_t e = since + 1; e <= to; ++e) {
+  for (epoch_t e = since; e <= to; ++e) {
     bufferlist bl;
     if (get_inc_map_bl(e, bl)) {
       m->incremental_maps[e] = bl;
@@ -7372,8 +7372,9 @@ void OSDService::maybe_share_map(
                << session->projected_epoch << dendl;
       return;
     }
-
-    send_from = session->projected_epoch;
+    // send incremental maps in the range of:
+    // (projected_epoch, osdmap]
+    send_from = session->projected_epoch + 1;
     dout(10) << __func__ << ": con " << con->get_peer_addr()
              << " map epoch " << session->projected_epoch
              << " -> " << osdmap->get_epoch()