]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/osd/heartbeat: maybe_share_osdmap() fix `send_from`
authorMatan Breizman <mbreizma@redhat.com>
Wed, 22 Nov 2023 08:20:35 +0000 (08:20 +0000)
committerMatan Breizman <mbreizma@redhat.com>
Wed, 27 Dec 2023 10:33:47 +0000 (10:33 +0000)
send_from should be the projected_epoch + 1,
See: OSDSingletonState::load_map_bls() which loads the
following range of osdmaps: [send_from, last].

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
src/crimson/osd/heartbeat.cc

index 266e56533c3bb1579afdf26fc2db9ce87aa0d42e..49e3562494791d5d4f1674e9c80e31a2d55990cb 100644 (file)
@@ -333,9 +333,8 @@ seastar::future<> Heartbeat::maybe_share_osdmap(
     return seastar::now();
   }
 
-  const epoch_t send_from = peer.get_projected_epoch();
-  logger().debug("{} sending peer {} peer maps from projected epoch {} through "
-                "local osdmap epoch {}",
+  const epoch_t send_from = peer.get_projected_epoch() + 1;
+  logger().debug("{} sending peer {} peer maps ({}, {}]",
                 __func__,
                 from,
                 send_from,