Merge pull request #56482 from ronen-fr/wip-65072-squid

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

Reviewed-by: Laura Flores <lflores@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

src/common/options/osd.yaml.in

@@ -520,17 +520,6 @@ options:
     stats (inc. scrub/block duration) every this many seconds.
   default: 120
   with_legacy: false
-- name: osd_scrub_slow_reservation_response
-  type: millisecs
-  level: advanced
-  desc: Maximum wait (milliseconds) for scrub reservations before issuing a cluster-log warning
-  long_desc: Waiting too long for a replica to respond to scrub resource reservation request.
-    Disable by setting to a very large value.
-  default: 30000
-  min: 500
-  see_also:
-  - osd_scrub_reservation_timeout
-  with_legacy: false
 - name: osd_scrub_reservation_timeout
   type: millisecs
   level: advanced
@@ -540,8 +529,6 @@ options:
     to a very large value.
   default: 300000
   min: 2000
-  see_also:
-  - osd_scrub_slow_reservation_response
   with_legacy: false
 - name: osd_scrub_disable_reservation_queuing
   type: bool

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,

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;