diff options
| author | Yuri Weinstein <yweinste@redhat.com> | 2024-01-24 22:30:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-24 22:30:50 +0100 |
| commit | e538587e185c5a4f9ced746d103d6f10d23cd897 (patch) | |
| tree | e4d314c82957f19497bb8166452bac1318fbba62 /qa/standalone | |
| parent | Merge pull request #53250 from YiteGu/add-perfcount-for-allocator (diff) | |
| parent | osd: distinguish between osd_pg_stat_report_max_(epoch|seconds) (diff) | |
| download | ceph-e538587e185c5a4f9ced746d103d6f10d23cd897.tar.xz ceph-e538587e185c5a4f9ced746d103d6f10d23cd897.zip | |
Merge pull request #54491 from jianwei1216/fix_osd_pg_stat_report_interval_max_cmain
fix: resolve inconsistent judgment of osd_pg_stat_report_interval_max
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Matan Breizman <Matan.Brz@gmail.com>
Diffstat (limited to 'qa/standalone')
| -rwxr-xr-x | qa/standalone/scrub/osd-scrub-snaps.sh | 13 | ||||
| -rw-r--r-- | qa/standalone/scrub/scrub-helpers.sh | 3 |
2 files changed, 10 insertions, 6 deletions
diff --git a/qa/standalone/scrub/osd-scrub-snaps.sh b/qa/standalone/scrub/osd-scrub-snaps.sh index c543b48a19c..40bd6a26e74 100755 --- a/qa/standalone/scrub/osd-scrub-snaps.sh +++ b/qa/standalone/scrub/osd-scrub-snaps.sh @@ -209,14 +209,16 @@ function TEST_scrub_snaps() { done ceph tell osd.* config set osd_shallow_scrub_chunk_max 25 ceph tell osd.* config set osd_shallow_scrub_chunk_min 5 - ceph tell osd.* config set osd_pg_stat_report_interval_max 1 + ceph tell osd.* config set osd_pg_stat_report_interval_max_seconds 1 + ceph tell osd.* config set osd_pg_stat_report_interval_max_epochs 1 wait_for_clean || return 1 ceph tell osd.* config get osd_shallow_scrub_chunk_max ceph tell osd.* config get osd_shallow_scrub_chunk_min - ceph tell osd.* config get osd_pg_stat_report_interval_max + ceph tell osd.* config get osd_pg_stat_report_interval_max_seconds + ceph tell osd.* config get osd_pg_stat_report_interval_max_epochs ceph tell osd.* config get osd_scrub_chunk_max ceph tell osd.* config get osd_scrub_chunk_min @@ -772,7 +774,8 @@ function _scrub_snaps_multi() { ceph tell osd.* config set osd_shallow_scrub_chunk_max 3 ceph tell osd.* config set osd_shallow_scrub_chunk_min 3 ceph tell osd.* config set osd_scrub_chunk_min 3 - ceph tell osd.* config set osd_pg_stat_report_interval_max 1 + ceph tell osd.* config set osd_pg_stat_report_interval_max_seconds 1 + ceph tell osd.* config set osd_pg_stat_report_interval_max_epochs 1 wait_for_clean || return 1 local pgid="${poolid}.0" @@ -1163,7 +1166,7 @@ fi function TEST_scrub_snaps_replica() { local dir=$1 ORIG_ARGS=$CEPH_ARGS - CEPH_ARGS+=" --osd_scrub_chunk_min=3 --osd_scrub_chunk_max=20 --osd_shallow_scrub_chunk_min=3 --osd_shallow_scrub_chunk_max=3 --osd_pg_stat_report_interval_max=1" + CEPH_ARGS+=" --osd_scrub_chunk_min=3 --osd_scrub_chunk_max=20 --osd_shallow_scrub_chunk_min=3 --osd_shallow_scrub_chunk_max=3 --osd_pg_stat_report_interval_max_seconds=1 --osd_pg_stat_report_interval_max_epochs=1" _scrub_snaps_multi $dir replica err=$? CEPH_ARGS=$ORIG_ARGS @@ -1173,7 +1176,7 @@ function TEST_scrub_snaps_replica() { function TEST_scrub_snaps_primary() { local dir=$1 ORIG_ARGS=$CEPH_ARGS - CEPH_ARGS+=" --osd_scrub_chunk_min=3 --osd_scrub_chunk_max=20 --osd_shallow_scrub_chunk_min=3 --osd_shallow_scrub_chunk_max=3 --osd_pg_stat_report_interval_max=1" + CEPH_ARGS+=" --osd_scrub_chunk_min=3 --osd_scrub_chunk_max=20 --osd_shallow_scrub_chunk_min=3 --osd_shallow_scrub_chunk_max=3 --osd_pg_stat_report_interval_max_seconds=1 --osd_pg_stat_report_interval_max_epochs=1" _scrub_snaps_multi $dir primary err=$? CEPH_ARGS=$ORIG_ARGS diff --git a/qa/standalone/scrub/scrub-helpers.sh b/qa/standalone/scrub/scrub-helpers.sh index 6816d71de32..3b0590fdfde 100644 --- a/qa/standalone/scrub/scrub-helpers.sh +++ b/qa/standalone/scrub/scrub-helpers.sh @@ -239,7 +239,8 @@ function standard_scrub_cluster() { --osd_scrub_interval_randomize_ratio=0 \ --osd_scrub_backoff_ratio=0.0 \ --osd_pool_default_pg_autoscale_mode=off \ - --osd_pg_stat_report_interval_max=1 \ + --osd_pg_stat_report_interval_max_seconds=1 \ + --osd_pg_stat_report_interval_max_epochs=1 \ $extra_pars" for osd in $(seq 0 $(expr $OSDS - 1)) |