From d181c3557d4d97f03a467b179e03a2f8b0c425a7 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Fri, 19 May 2023 15:29:25 -0700 Subject: [PATCH] crimson/osd/heartbeat: clarify variable names in Heartbeat::handle_ping Signed-off-by: Samuel Just (cherry picked from commit 004fc660496a881319c432e443453c64b1ce6524) --- src/crimson/osd/heartbeat.cc | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/crimson/osd/heartbeat.cc b/src/crimson/osd/heartbeat.cc index 1f0c86a568667..0bbfe37bc7fa8 100644 --- a/src/crimson/osd/heartbeat.cc +++ b/src/crimson/osd/heartbeat.cc @@ -303,37 +303,36 @@ seastar::future<> Heartbeat::maybe_share_osdmap( Ref m) { const osd_id_t from = m->get_source().num(); - const epoch_t osdmap_epoch = service.get_map()->get_epoch(); - const epoch_t peer_epoch = m->map_epoch; + const epoch_t current_osdmap_epoch = service.get_map()->get_epoch(); auto found = peers.find(from); if (found == peers.end()) { return seastar::now(); } auto& peer = found->second; - if (peer_epoch > peer.get_projected_epoch()) { + if (m->map_epoch > peer.get_projected_epoch()) { logger().debug("{} updating session's projected_epoch" "from {} to peer's (id: {}) map epoch of {}", __func__, peer.get_projected_epoch(), - from, peer_epoch); - peer.set_projected_epoch(peer_epoch); + from, m->map_epoch); + peer.set_projected_epoch(m->map_epoch); } - if (osdmap_epoch <= peer.get_projected_epoch()) { + if (current_osdmap_epoch <= peer.get_projected_epoch()) { logger().info("{} projected_epoch {} is already later " "than osdmap epoch of {}", __func__ , peer.get_projected_epoch(), - osdmap_epoch); + current_osdmap_epoch); return seastar::now(); } logger().info("{} peer id: {} epoch is {} while osdmap is {}", - __func__ , from, m->map_epoch, osdmap_epoch); - if (osdmap_epoch > m->map_epoch) { + __func__ , from, m->map_epoch, current_osdmap_epoch); + if (current_osdmap_epoch > m->map_epoch) { logger().debug("{} sharing osdmap epoch of {} with peer id {}", - __func__, osdmap_epoch, from); + __func__, current_osdmap_epoch, from); // Peer's newest map is m->map_epoch. Therfore it misses - // the osdmaps in the range of `m->map_epoch` to `osdmap_epoch`. + // the osdmaps in the range of `m->map_epoch` to `current_osdmap_epoch`. return service.send_incremental_map_to_osd(from, m->map_epoch); } return seastar::now(); -- 2.39.5