From f5e6b607b97b4fb4b3d19429d49a75b9ef24d303 Mon Sep 17 00:00:00 2001 From: Ronen Friedman Date: Sun, 14 Jan 2024 20:53:38 +0200 Subject: [PATCH] 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 --- qa/suites/rados/thrash/3-scrub-overrides/default.yaml | 0 ...ltaneous-scrubs-2.yaml => max-simultaneous-scrubs-1.yaml} | 2 +- .../thrash/3-scrub-overrides/max-simultaneous-scrubs-5.yaml | 5 +++++ 3 files changed, 6 insertions(+), 1 deletion(-) delete mode 100644 qa/suites/rados/thrash/3-scrub-overrides/default.yaml rename qa/suites/rados/thrash/3-scrub-overrides/{max-simultaneous-scrubs-2.yaml => max-simultaneous-scrubs-1.yaml} (60%) create mode 100644 qa/suites/rados/thrash/3-scrub-overrides/max-simultaneous-scrubs-5.yaml 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-2.yaml b/qa/suites/rados/thrash/3-scrub-overrides/max-simultaneous-scrubs-1.yaml similarity index 60% rename from qa/suites/rados/thrash/3-scrub-overrides/max-simultaneous-scrubs-2.yaml rename to qa/suites/rados/thrash/3-scrub-overrides/max-simultaneous-scrubs-1.yaml index abf852e98510..9a63786f80d7 100644 --- a/qa/suites/rados/thrash/3-scrub-overrides/max-simultaneous-scrubs-2.yaml +++ b/qa/suites/rados/thrash/3-scrub-overrides/max-simultaneous-scrubs-1.yaml @@ -2,4 +2,4 @@ overrides: ceph: conf: osd: - osd max scrubs: 2 + osd max scrubs: 1 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 -- 2.47.3