From: Ronen Friedman Date: Sun, 14 Jan 2024 18:53:38 +0000 (+0200) Subject: test/scrub: modify selection of max-scrubs configuration values X-Git-Tag: v19.3.0~221^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f5e6b607b97b4fb4b3d19429d49a75b9ef24d303;p=ceph.git test/scrub: modify selection of max-scrubs configuration values As the osd-max-scrubs default was increased from 1 to (currently) 3, the original set of optional values under rados/thrash/3-scrub-overrides are no longer useful. This commits changes the set of optional values to reflect the current default. Signed-off-by: Ronen Friedman --- diff --git a/qa/suites/rados/thrash/3-scrub-overrides/default.yaml b/qa/suites/rados/thrash/3-scrub-overrides/default.yaml deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/qa/suites/rados/thrash/3-scrub-overrides/max-simultaneous-scrubs-1.yaml b/qa/suites/rados/thrash/3-scrub-overrides/max-simultaneous-scrubs-1.yaml new file mode 100644 index 000000000000..9a63786f80d7 --- /dev/null +++ b/qa/suites/rados/thrash/3-scrub-overrides/max-simultaneous-scrubs-1.yaml @@ -0,0 +1,5 @@ +overrides: + ceph: + conf: + osd: + osd max scrubs: 1 diff --git a/qa/suites/rados/thrash/3-scrub-overrides/max-simultaneous-scrubs-2.yaml b/qa/suites/rados/thrash/3-scrub-overrides/max-simultaneous-scrubs-2.yaml deleted file mode 100644 index abf852e98510..000000000000 --- a/qa/suites/rados/thrash/3-scrub-overrides/max-simultaneous-scrubs-2.yaml +++ /dev/null @@ -1,5 +0,0 @@ -overrides: - ceph: - conf: - osd: - osd max scrubs: 2 diff --git a/qa/suites/rados/thrash/3-scrub-overrides/max-simultaneous-scrubs-5.yaml b/qa/suites/rados/thrash/3-scrub-overrides/max-simultaneous-scrubs-5.yaml new file mode 100644 index 000000000000..bb36e9970ca7 --- /dev/null +++ b/qa/suites/rados/thrash/3-scrub-overrides/max-simultaneous-scrubs-5.yaml @@ -0,0 +1,5 @@ +overrides: + ceph: + conf: + osd: + osd max scrubs: 5