osd/scrub: no "slow response" warning for queued reservations

When sending a "queued reservation" request (the new default), the OSD
will not respond until the reservation is granted.  This can take a
long time, and the client should not be warned about a "slow response".

Fixes: https://tracker.ceph.com/issues/64869
Signed-off-by: Ronen Friedman <rfriedma@redhat.com>

diff --git a/src/osd/scrubber/scrub_reservations.cc b/src/osd/scrubber/scrub_reservations.cc
index 284d90290578a2e2b8a8297cb3dc8af983fbc4b9..b9cc2d096ad0acb9fedd6b8eed0a6ba4c0cff925 100644 (file)
--- a/src/osd/scrubber/scrub_reservations.cc
+++ b/src/osd/scrubber/scrub_reservations.cc
@@ -60,13 +60,9 @@ ReplicaReservations::ReplicaReservations(
     dout(10) << "high-priority scrub - no reservations needed" << dendl;
     m_perf_set.inc(scrbcnt_resrv_skipped);
   } else {
-    m_process_started_at = ScrubClock::now();
-
     // send out the 1'st request (unless we have no replicas)
+    m_process_started_at = ScrubClock::now();
     send_next_reservation_or_complete();
-    m_slow_response_warn_timeout =
-       m_scrubber.get_pg_cct()->_conf.get_val<milliseconds>(
-           "osd_scrub_slow_reservation_response");
   }
 }
 
@@ -174,16 +170,6 @@ bool ReplicaReservations::handle_reserve_grant(
   }
 
   auto elapsed = ScrubClock::now() - m_last_request_sent_at;
-
-  // log a warning if the response was slow to arrive
-  if ((m_slow_response_warn_timeout > 0ms) &&
-      (elapsed > m_slow_response_warn_timeout)) {
-    m_osds->clog->warn() << fmt::format(
-       "slow reservation response from {} ({}ms)", from,
-       duration_cast<milliseconds>(elapsed).count());
-    // prevent additional warnings
-    m_slow_response_warn_timeout = 0ms;
-  }
   dout(10) << fmt::format(
                  "(e:{} nonce:{}) granted by {} ({} of {}) in {}ms",
                  msg.map_epoch, msg.reservation_nonce, from,

diff --git a/src/osd/scrubber/scrub_reservations.h b/src/osd/scrubber/scrub_reservations.h
index 2e13760ffa1f049b03138a6ee5e28c94202042f2..173b23d7db52c5ecfa9b2a45a80ecb250b51020d 100644 (file)
--- a/src/osd/scrubber/scrub_reservations.h
+++ b/src/osd/scrubber/scrub_reservations.h
@@ -90,10 +90,6 @@ class ReplicaReservations {
    */
   reservation_nonce_t& m_last_request_sent_nonce;
 
-  /// the 'slow response' timeout (in milliseconds) - as configured.
-  /// Doubles as a 'do once' flag for the warning.
-  std::chrono::milliseconds m_slow_response_warn_timeout;
-
   /// access to the performance counters container relevant to this scrub
   /// parameters
   PerfCounters& m_perf_set;