Merge pull request ceph#56243 from ronen-fr/wip-rf-clnMar24

osd/scrub: fixing minor clang-tidy warnings

Reviewed-by: Aishwarya Mathuria <[email protected]>

Author: yuriw

src/osd/scrubber/osd_scrub.cc

@@ -266,10 +266,10 @@ OsdScrub::LoadTracker::LoadTracker(
 ///\todo replace with Knuth's algo (to reduce the numerical error)
 std::optional<double> OsdScrub::LoadTracker::update_load_average()
 {
-  int hb_interval = conf->osd_heartbeat_interval;
+  auto hb_interval = conf->osd_heartbeat_interval;
   int n_samples = std::chrono::duration_cast<seconds>(24h).count();
   if (hb_interval > 1) {
-    n_samples = std::max(n_samples / hb_interval, 1);
+    n_samples = std::max(n_samples / hb_interval, 1L);
   }
 
   double loadavg;

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());

src/osd/scrubber/scrub_machine.cc

@@ -214,6 +214,7 @@ sc::result Session::react(const IntervalChanged&)
   DECLARE_LOCALS;  // 'scrbr' & 'pg_id' aliases
   dout(10) << "Session::react(const IntervalChanged&)" << dendl;
 
+  ceph_assert(m_reservations);
   m_reservations->discard_remote_reservations();
   return transit<NotActive>();
 }
@@ -267,7 +268,9 @@ sc::result ReservingReplicas::react(const ReplicaGrant& ev)
   dout(10) << "ReservingReplicas::react(const ReplicaGrant&)" << dendl;
   const auto& m = ev.m_op->get_req<MOSDScrubReserve>();
 
-  if (context<Session>().m_reservations->handle_reserve_grant(*m, ev.m_from)) {
+  auto& session = context<Session>();
+  ceph_assert(session.m_reservations);
+  if (session.m_reservations->handle_reserve_grant(*m, ev.m_from)) {
     // we are done with the reservation process
     return transit<ActiveScrubbing>();
   }
@@ -279,6 +282,7 @@ sc::result ReservingReplicas::react(const ReplicaReject& ev)
   DECLARE_LOCALS;  // 'scrbr' & 'pg_id' aliases
   auto& session = context<Session>();
   dout(10) << "ReservingReplicas::react(const ReplicaReject&)" << dendl;
+  ceph_assert(session.m_reservations);
   const auto m = ev.m_op->get_req<MOSDScrubReserve>();
 
   // Verify that the message is from the replica we were expecting a reply from,
@@ -306,6 +310,8 @@ sc::result ReservingReplicas::react(const ReservationTimeout&)
   DECLARE_LOCALS;  // 'scrbr' & 'pg_id' aliases
   auto& session = context<Session>();
   dout(10) << "ReservingReplicas::react(const ReservationTimeout&)" << dendl;
+  ceph_assert(session.m_reservations);
+
   session.m_reservations->log_failure_and_duration(scrbcnt_resrv_timed_out);
 
   const auto msg = fmt::format(

src/osd/scrubber/scrub_reservations.cc

@@ -94,11 +94,12 @@ void ReplicaReservations::discard_remote_reservations()
 
 void ReplicaReservations::log_success_and_duration()
 {
+  ceph_assert(m_process_started_at.has_value());
   auto logged_duration = ScrubClock::now() - m_process_started_at.value();
   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();
 }