From: Ronen Friedman <rfriedma@redhat.com>
Date: Tue, 9 Jan 2024 12:51:46 +0000 (-0600)
Subject: osd/scrub: allow replicas to scrub even if OSD has recovery in progress
X-Git-Tag: v19.3.0~217^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F55105%2Fhead;p=ceph.git

osd/scrub: allow replicas to scrub even if OSD has recovery in progress

Limit the check ("not scrubbing if the OSD is performing recovery on
some PG") to the primary OSD. Otherwise - a small number of backfills may
prevent a large number of PGs from scrubbing.

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

diff --git a/src/osd/scrubber/scrub_machine.cc b/src/osd/scrubber/scrub_machine.cc
index 9aa5842c490..eac26a85f85 100644
--- a/src/osd/scrubber/scrub_machine.cc
+++ b/src/osd/scrubber/scrub_machine.cc
@@ -819,11 +819,6 @@ ReplicaActive::ReservationAttemptRes ReplicaActive::get_remote_reservation()
 {
   using ReservationAttemptRes = ReplicaActive::ReservationAttemptRes;
   DECLARE_LOCALS;  // 'scrbr' & 'pg_id' aliases
-  if (!scrbr->get_pg_cct()->_conf.get_val<bool>("osd_scrub_during_recovery") &&
-      m_osds->is_recovery_active()) {
-    return ReservationAttemptRes{
-	MOSDScrubReserve::REJECT, "recovery is active", false};
-  }
 
   if (m_osds->get_scrub_services().inc_scrubs_remote(scrbr->get_spgid().pgid)) {
     return ReservationAttemptRes{MOSDScrubReserve::GRANT, "", true};