From: Ronen Friedman <rfriedma@redhat.com>
Date: Fri, 22 Mar 2024 13:06:09 +0000 (-0500)
Subject: osd/scrub: remove osd_scrub_reservation_timeout config option
X-Git-Tag: v19.1.0~37^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c40347781c08ab8ad314044e66ff01c5e2d7ca43;p=ceph.git

osd/scrub: remove osd_scrub_reservation_timeout config option

following the removal of the reservation timeout handling code.

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
(cherry picked from commit 2836805cfe9572b2e4c934716dc0967d9cdbfdc9)
---

diff --git a/src/common/options/osd.yaml.in b/src/common/options/osd.yaml.in
index 235d904627b9..50d6040bf1f3 100644
--- a/src/common/options/osd.yaml.in
+++ b/src/common/options/osd.yaml.in
@@ -520,16 +520,6 @@ options:
     stats (inc. scrub/block duration) every this many seconds.
   default: 120
   with_legacy: false
-- name: osd_scrub_reservation_timeout
-  type: millisecs
-  level: advanced
-  desc: Maximum wait (milliseconds) for replicas' response to scrub reservation requests
-  long_desc: Maximum wait (milliseconds) for all replicas to respond to
-    scrub reservation requests, before the scrub session is aborted. Disable by setting
-    to a very large value.
-  default: 300000
-  min: 2000
-  with_legacy: false
 - name: osd_scrub_disable_reservation_queuing
   type: bool
   level: advanced