From 3bfc139264223ff250e81ac96fb4e6530d01cce8 Mon Sep 17 00:00:00 2001 From: Sridhar Seshasayee Date: Sat, 29 Apr 2023 10:28:04 +0530 Subject: [PATCH] qa/: Override mClock profile to 'high_recovery_ops' for qa tests The qa tests are not client I/O centric and mostly focus on triggering recovery/backfills and monitor them for completion within a finite amount of time. The same holds true for scrub operations. Therefore, an mClock profile that optimizes background operations is a better fit for qa related tests. The osd_mclock_profile is therefore globally overriden to 'high_recovery_ops' profile for the Rados suite as it fits the requirement. Also, many standalone tests expect recovery and scrub operations to complete within a finite time. To ensure this, the osd_mclock_profile options is set to 'high_recovery_ops' as part of the run_osd() function in ceph-helpers.sh. A subset of standalone tests explicitly used 'high_recovery_ops' profile. Since the profile is now set as part of run_osd(), the earlier overrides are redundant and therefore removed from the tests. Signed-off-by: Sridhar Seshasayee --- qa/config/rados.yaml | 1 + qa/standalone/ceph-helpers.sh | 2 ++ qa/standalone/erasure-code/test-erasure-eio.sh | 1 - qa/standalone/osd-backfill/osd-backfill-space.sh | 1 - qa/standalone/osd-backfill/osd-backfill-stats.sh | 2 -- qa/standalone/osd/osd-recovery-stats.sh | 2 -- qa/standalone/osd/osd-rep-recov-eio.sh | 1 - qa/standalone/osd/repeer-on-acting-back.sh | 1 - 8 files changed, 3 insertions(+), 8 deletions(-) diff --git a/qa/config/rados.yaml b/qa/config/rados.yaml index 1785089fb4b2e..710847f594b8f 100644 --- a/qa/config/rados.yaml +++ b/qa/config/rados.yaml @@ -8,5 +8,6 @@ overrides: osd debug verify cached snaps: true bluestore zero block detection: true osd mclock override recovery settings: true + osd mclock profile: high_recovery_ops mon: mon scrub interval: 300 diff --git a/qa/standalone/ceph-helpers.sh b/qa/standalone/ceph-helpers.sh index 66a9dca54e041..9f93be9233739 100755 --- a/qa/standalone/ceph-helpers.sh +++ b/qa/standalone/ceph-helpers.sh @@ -654,6 +654,7 @@ function run_osd() { ceph_args+=" --osd-max-object-name-len=460" ceph_args+=" --osd-max-object-namespace-len=64" ceph_args+=" --enable-experimental-unrecoverable-data-corrupting-features=*" + ceph_args+=" --osd-mclock-profile=high_recovery_ops" ceph_args+=" " ceph_args+="$@" mkdir -p $osd_data @@ -864,6 +865,7 @@ function activate_osd() { ceph_args+=" --osd-max-object-name-len=460" ceph_args+=" --osd-max-object-namespace-len=64" ceph_args+=" --enable-experimental-unrecoverable-data-corrupting-features=*" + ceph_args+=" --osd-mclock-profile=high_recovery_ops" ceph_args+=" " ceph_args+="$@" mkdir -p $osd_data diff --git a/qa/standalone/erasure-code/test-erasure-eio.sh b/qa/standalone/erasure-code/test-erasure-eio.sh index 85c2763307f5b..42c538eb9184e 100755 --- a/qa/standalone/erasure-code/test-erasure-eio.sh +++ b/qa/standalone/erasure-code/test-erasure-eio.sh @@ -26,7 +26,6 @@ function run() { export CEPH_ARGS 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')} diff --git a/qa/standalone/osd-backfill/osd-backfill-space.sh b/qa/standalone/osd-backfill/osd-backfill-space.sh index 671bcdee138fd..6a5c69412f45c 100755 --- a/qa/standalone/osd-backfill/osd-backfill-space.sh +++ b/qa/standalone/osd-backfill/osd-backfill-space.sh @@ -28,7 +28,6 @@ function run() { CEPH_ARGS+="--osd_min_pg_log_entries=5 --osd_max_pg_log_entries=10 " 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-backfill/osd-backfill-stats.sh b/qa/standalone/osd-backfill/osd-backfill-stats.sh index f2e5f83dabff6..21b42a4ce75b7 100755 --- a/qa/standalone/osd-backfill/osd-backfill-stats.sh +++ b/qa/standalone/osd-backfill/osd-backfill-stats.sh @@ -27,8 +27,6 @@ function run() { CEPH_ARGS+="--fsid=$(uuidgen) --auth-supported=none " CEPH_ARGS+="--mon-host=$CEPH_MON " CEPH_ARGS+="--osd_min_pg_log_entries=5 --osd_max_pg_log_entries=10 " - # Use "high_recovery_ops" profile if mclock_scheduler is enabled. - CEPH_ARGS+="--osd-mclock-profile=high_recovery_ops " export margin=10 export objects=200 export poolname=test diff --git a/qa/standalone/osd/osd-recovery-stats.sh b/qa/standalone/osd/osd-recovery-stats.sh index 42347510f6aa2..ad6f810d77a3e 100755 --- a/qa/standalone/osd/osd-recovery-stats.sh +++ b/qa/standalone/osd/osd-recovery-stats.sh @@ -28,8 +28,6 @@ function run() { CEPH_ARGS+="--mon-host=$CEPH_MON " # so we will not force auth_log_shard to be acting_primary CEPH_ARGS+="--osd_force_auth_primary_missing_objects=1000000 " - # Use "high_recovery_ops" profile if mclock_scheduler is enabled. - CEPH_ARGS+="--osd-mclock-profile=high_recovery_ops " export margin=10 export objects=200 export poolname=test diff --git a/qa/standalone/osd/osd-rep-recov-eio.sh b/qa/standalone/osd/osd-rep-recov-eio.sh index 6f871ef8fa8c8..c088f80a9d8be 100755 --- a/qa/standalone/osd/osd-rep-recov-eio.sh +++ b/qa/standalone/osd/osd-rep-recov-eio.sh @@ -29,7 +29,6 @@ function run() { export CEPH_ARGS CEPH_ARGS+="--fsid=$(uuidgen) --auth-supported=none " CEPH_ARGS+="--mon-host=$CEPH_MON " - CEPH_ARGS+="--osd-mclock-profile=high_recovery_ops " local funcs=${@:-$(set | sed -n -e 's/^\(TEST_[0-9a-z_]*\) .*/\1/p')} diff --git a/qa/standalone/osd/repeer-on-acting-back.sh b/qa/standalone/osd/repeer-on-acting-back.sh index 2a7e8a0ce4c8e..af406ef926b28 100755 --- a/qa/standalone/osd/repeer-on-acting-back.sh +++ b/qa/standalone/osd/repeer-on-acting-back.sh @@ -34,7 +34,6 @@ function run() { CEPH_ARGS+="--osd_force_auth_primary_missing_objects=1000000 " # use small pg_log settings, so we always do backfill instead of recovery CEPH_ARGS+="--osd_min_pg_log_entries=$loglen --osd_max_pg_log_entries=$loglen --osd_pg_log_trim_min=$trim " - CEPH_ARGS+="--osd_mclock_profile=high_recovery_ops " local funcs=${@:-$(set | sed -n -e 's/^\(TEST_[0-9a-z_]*\) .*/\1/p')} for func in $funcs ; do -- 2.39.5