From 1729ffc80b80fa94ce0cc73b29a4e28ab046119f Mon Sep 17 00:00:00 2001 From: Ronen Friedman Date: Thu, 14 Mar 2024 11:15:55 -0500 Subject: [PATCH] osd/scrub: use std::ssize() to avoid narrowing conversions using std::ssize() to avoid a narrowing conversion when using the size of a container as a parameter to a function expecting an int64_t. Signed-off-by: Ronen Friedman --- src/osd/scrubber/pg_scrubber.cc | 2 +- src/osd/scrubber/scrub_reservations.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osd/scrubber/pg_scrubber.cc b/src/osd/scrubber/pg_scrubber.cc index 9fe7295201d..e1604222c2c 100644 --- a/src/osd/scrubber/pg_scrubber.cc +++ b/src/osd/scrubber/pg_scrubber.cc @@ -1504,7 +1504,7 @@ void PgScrubber::apply_snap_mapper_fixes( void PgScrubber::maps_compare_n_cleanup() { - m_pg->add_objects_scrubbed_count(m_be->get_primary_scrubmap().objects.size()); + m_pg->add_objects_scrubbed_count(std::ssize(m_be->get_primary_scrubmap().objects)); auto required_fixes = m_be->scrub_compare_maps(m_end.is_max(), get_snap_mapper_accessor()); diff --git a/src/osd/scrubber/scrub_reservations.cc b/src/osd/scrubber/scrub_reservations.cc index 918bf486925..d52c10456aa 100644 --- a/src/osd/scrubber/scrub_reservations.cc +++ b/src/osd/scrubber/scrub_reservations.cc @@ -103,7 +103,7 @@ void ReplicaReservations::log_success_and_duration() m_perf_set.tinc(scrbcnt_resrv_successful_elapsed, logged_duration); m_perf_set.inc(scrbcnt_resrv_success); m_osds->logger->hinc( - l_osd_scrub_reservation_dur_hist, m_sorted_secondaries.size(), + l_osd_scrub_reservation_dur_hist, std::ssize(m_sorted_secondaries), logged_duration.count()); m_process_started_at.reset(); } -- 2.39.5