From 5b2fee21e85ff46441701f2e3cdf43f13181db54 Mon Sep 17 00:00:00 2001 From: Sridhar Seshasayee Date: Mon, 12 Dec 2022 12:39:33 +0530 Subject: [PATCH] qa: Allow tests to override recovery configs with mClock scheduler enabled Set osd_mclock_override_recovery_settings option to true for tests that modify recovery/backfill configuration options. This prevents logging of the cluster warning when modifying recovery/backfill limits. Fixes: https://tracker.ceph.com/issues/57529 Signed-off-by: Sridhar Seshasayee --- qa/config/rados.yaml | 1 + qa/standalone/erasure-code/test-erasure-eio.sh | 1 + qa/standalone/osd-backfill/osd-backfill-recovery-log.sh | 1 + qa/standalone/osd-backfill/osd-backfill-space.sh | 1 + qa/standalone/osd/osd-recovery-space.sh | 1 + qa/suites/rados/dashboard/tasks/dashboard.yaml | 6 ++++++ 6 files changed, 11 insertions(+) diff --git a/qa/config/rados.yaml b/qa/config/rados.yaml index 2f5779b0e9c..1785089fb4b 100644 --- a/qa/config/rados.yaml +++ b/qa/config/rados.yaml @@ -7,5 +7,6 @@ overrides: osd debug verify missing on start: true osd debug verify cached snaps: true bluestore zero block detection: true + osd mclock override recovery settings: true mon: mon scrub interval: 300 diff --git a/qa/standalone/erasure-code/test-erasure-eio.sh b/qa/standalone/erasure-code/test-erasure-eio.sh index e08c68377f6..85c2763307f 100755 --- a/qa/standalone/erasure-code/test-erasure-eio.sh +++ b/qa/standalone/erasure-code/test-erasure-eio.sh @@ -27,6 +27,7 @@ function run() { CEPH_ARGS+="--fsid=$(uuidgen) --auth-supported=none " CEPH_ARGS+="--mon-host=$CEPH_MON " CEPH_ARGS+="--osd-mclock-profile=high_recovery_ops " + CEPH_ARGS+="--osd_mclock_override_recovery_settings=true " local funcs=${@:-$(set | sed -n -e 's/^\(TEST_[0-9a-z_]*\) .*/\1/p')} for func in $funcs ; do diff --git a/qa/standalone/osd-backfill/osd-backfill-recovery-log.sh b/qa/standalone/osd-backfill/osd-backfill-recovery-log.sh index 6f20d90b5b5..f9a14493215 100755 --- a/qa/standalone/osd-backfill/osd-backfill-recovery-log.sh +++ b/qa/standalone/osd-backfill/osd-backfill-recovery-log.sh @@ -26,6 +26,7 @@ function run() { export CEPH_ARGS CEPH_ARGS+="--fsid=$(uuidgen) --auth-supported=none " CEPH_ARGS+="--mon-host=$CEPH_MON --osd_max_backfills=1 --debug_reserver=20 " + CEPH_ARGS+="--osd_mclock_override_recovery_settings=true " local funcs=${@:-$(set | sed -n -e 's/^\(TEST_[0-9a-z_]*\) .*/\1/p')} for func in $funcs ; do diff --git a/qa/standalone/osd-backfill/osd-backfill-space.sh b/qa/standalone/osd-backfill/osd-backfill-space.sh index 8bc452d6cbb..671bcdee138 100755 --- a/qa/standalone/osd-backfill/osd-backfill-space.sh +++ b/qa/standalone/osd-backfill/osd-backfill-space.sh @@ -29,6 +29,7 @@ function run() { CEPH_ARGS+="--fake_statfs_for_testing=3686400 " CEPH_ARGS+="--osd_max_backfills=10 " CEPH_ARGS+="--osd_mclock_profile=high_recovery_ops " + CEPH_ARGS+="--osd_mclock_override_recovery_settings=true " export objects=600 export poolprefix=test diff --git a/qa/standalone/osd/osd-recovery-space.sh b/qa/standalone/osd/osd-recovery-space.sh index 07ed09b4380..3bafc5138bb 100755 --- a/qa/standalone/osd/osd-recovery-space.sh +++ b/qa/standalone/osd/osd-recovery-space.sh @@ -26,6 +26,7 @@ function run() { CEPH_ARGS+="--fsid=$(uuidgen) --auth-supported=none " CEPH_ARGS+="--mon-host=$CEPH_MON " CEPH_ARGS+="--osd_max_backfills=10 " + CEPH_ARGS+="--osd_mclock_override_recovery_settings=true " export objects=600 export poolprefix=test diff --git a/qa/suites/rados/dashboard/tasks/dashboard.yaml b/qa/suites/rados/dashboard/tasks/dashboard.yaml index fd2c47cba5e..c781061de9c 100644 --- a/qa/suites/rados/dashboard/tasks/dashboard.yaml +++ b/qa/suites/rados/dashboard/tasks/dashboard.yaml @@ -2,6 +2,12 @@ roles: - [mgr.x, mon.a, mon.c, mds.a, mds.c, osd.0, client.0] - [mgr.y, mgr.z, mon.b, mds.b, osd.1, osd.2, osd.3, client.1] +overrides: + ceph: + conf: + osd: + osd mclock override recovery settings: true + tasks: - install: - ceph: -- 2.39.5