osd/: misc scrub related formatting fixes -- no functional changes

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 4f5e5824fe18931d336866b842385cf80a974aa6..211d8a3d46f1d076e731935823d4bab8a471ab69 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -1692,7 +1692,10 @@ void PG::on_info_history_change()
 
 void PG::reschedule_scrub()
 {
-  dout(20) << __func__ << " for a " << (is_primary() ? "Primary" : "non-primary") <<dendl;
+  dout(20) << fmt::format(
+                 "{} for a {}", __func__,
+                 (is_primary() ? "Primary" : "non-primary"))
+          << dendl;
 
   // we are assuming no change in primary status
   if (is_primary()) {

diff --git a/src/osd/scrubber/pg_scrubber.cc b/src/osd/scrubber/pg_scrubber.cc
index e39a3b53cca072814dc9fcfe862ff1f12458a855..806e5d8a84d5935acdc120ca7f64e9342ee078e9 100644 (file)
--- a/src/osd/scrubber/pg_scrubber.cc
+++ b/src/osd/scrubber/pg_scrubber.cc
@@ -557,7 +557,7 @@ void PgScrubber::update_scrub_job(const requested_scrub_t& request_flags)
   if (is_primary() && m_scrub_job) {
     ceph_assert(m_pg->is_locked());
     auto suggested = m_osds->get_scrub_services().determine_scrub_time(
-      request_flags, m_pg->info, m_pg->get_pgpool().info.opts);
+       request_flags, m_pg->info, m_pg->get_pgpool().info.opts);
     m_osds->get_scrub_services().update_job(m_scrub_job, suggested);
     m_pg->publish_stats_to_osd();
   }
@@ -2380,7 +2380,9 @@ void PgScrubber::reset_internal_state()
 // note that only applicable to the Replica:
 void PgScrubber::advance_token()
 {
-  dout(10) << __func__ << " was: " << m_current_token << dendl;
+  dout(10) << fmt::format("{}: prev. token:{}", __func__, m_current_token)
+          << dendl;
+
   m_current_token++;
 
   // when advance_token() is called, it is assumed that no scrubbing takes
@@ -2566,11 +2568,12 @@ ReplicaReservations::ReplicaReservations(
     , m_conf{conf}
 {
   epoch_t epoch = m_pg->get_osdmap_epoch();
-  m_timeout = conf.get_val<std::chrono::milliseconds>(
-    "osd_scrub_slow_reservation_response");
   m_log_msg_prefix = fmt::format(
-    "osd.{} ep: {} scrubber::ReplicaReservations pg[{}]: ", m_osds->whoami,
-    epoch, pg->pg_id);
+      "osd.{} ep: {} scrubber::ReplicaReservations pg[{}]: ", m_osds->whoami,
+      epoch, pg->pg_id);
+
+  m_timeout = conf.get_val<std::chrono::milliseconds>(
+      "osd_scrub_slow_reservation_response");
 
   if (m_pending <= 0) {
     // A special case of no replicas.

diff --git a/src/osd/scrubber/pg_scrubber.h b/src/osd/scrubber/pg_scrubber.h
index 8b5844be6de159f591fbab4e152baa79ee4346c3..bad3f00964f5272548e6578d9ad1ba25c8d66681 100644 (file)
--- a/src/osd/scrubber/pg_scrubber.h
+++ b/src/osd/scrubber/pg_scrubber.h
@@ -394,9 +394,10 @@ class PgScrubber : public ScrubPgIF,
     std::string_view caller,
     const requested_scrub_t& request_flags) final;
 
-  void scrub_requested(scrub_level_t scrub_level,
-                      scrub_type_t scrub_type,
-                      requested_scrub_t& req_flags) final;
+  void scrub_requested(
+      scrub_level_t scrub_level,
+      scrub_type_t scrub_type,
+      requested_scrub_t& req_flags) final;
 
   /**
    * Reserve local scrub resources (managed by the OSD)
@@ -477,6 +478,7 @@ class PgScrubber : public ScrubPgIF,
                 std::string param,
                 Formatter* f,
                 std::stringstream& ss) override;
+
   int m_debug_blockrange{0};
 
   // --------------------------------------------------------------------------