From 390fbf7fc0638b0c30a2dfb518cdbc8d4310a978 Mon Sep 17 00:00:00 2001 From: Matan Breizman Date: Wed, 22 Nov 2023 08:20:35 +0000 Subject: [PATCH] crimson/osd/heartbeat: maybe_share_osdmap() fix `send_from` 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 --- src/crimson/osd/heartbeat.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/crimson/osd/heartbeat.cc b/src/crimson/osd/heartbeat.cc index 266e56533c3b..49e356249479 100644 --- a/src/crimson/osd/heartbeat.cc +++ b/src/crimson/osd/heartbeat.cc @@ -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, -- 2.47.3