From e23e00f18cb5f8e9fcaa9c8ca1daea49c17e0236 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Fri, 19 May 2023 15:36:16 -0700 Subject: [PATCH] crimson/osd/heartbeat: clarify logging in Heartbeat::maybe_share_osdmap Reduce verbosity and ensure that all log lines have the peer id. Signed-off-by: Samuel Just (cherry picked from commit f89b5beaa576c5869ffa565faf7eb846a28aa3ba) --- src/crimson/osd/heartbeat.cc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/crimson/osd/heartbeat.cc b/src/crimson/osd/heartbeat.cc index 0bbfe37bc7f..bba53ef38f9 100644 --- a/src/crimson/osd/heartbeat.cc +++ b/src/crimson/osd/heartbeat.cc @@ -311,25 +311,25 @@ seastar::future<> Heartbeat::maybe_share_osdmap( auto& peer = found->second; 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, m->map_epoch); + logger().debug("{} updating peer {} session's projected_epoch" + "from {} to ping map epoch of {}", + __func__, from, peer.get_projected_epoch(), + m->map_epoch); peer.set_projected_epoch(m->map_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(), - current_osdmap_epoch); + logger().debug("{} peer {} projected_epoch {} is already later " + "than our osdmap epoch of {}", + __func__ , from, peer.get_projected_epoch(), + current_osdmap_epoch); return seastar::now(); } - logger().info("{} peer id: {} epoch is {} while osdmap is {}", - __func__ , from, m->map_epoch, current_osdmap_epoch); + logger().debug("{} peer {} projected_epoch is {} while osdmap is {}", + __func__ , from, m->map_epoch, current_osdmap_epoch); if (current_osdmap_epoch > m->map_epoch) { - logger().debug("{} sharing osdmap epoch of {} with peer id {}", + logger().debug("{} sharing osdmap epoch of {} with peer {}", __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 `current_osdmap_epoch`. -- 2.39.5