From 1dd6cf8d31a4f47273440c8bccc6719a3f5019a8 Mon Sep 17 00:00:00 2001 From: Ronen Friedman Date: Wed, 21 May 2025 08:27:30 -0500 Subject: [PATCH] qa/standalone/scrub: extra delay in osd-scrub-test.sh Modify TEST_just_deep_scrubs(): The test turns 'no-deep' off, and expects the scrub to be concluded and reported within a short period. But the PG already had a chance to try scrubbing (and fail due to the 'no-deep'), and its 'not-before' was pushed out by osd_scrub_retry_after_noscrub. The fix is to reduce the value of osd_scrub_retry_after_noscrub for this test, and to increase the timeout for the test itself. Fixes: https://tracker.ceph.com/issues/71404 Signed-off-by: Ronen Friedman (cherry picked from commit cb91678ab09723088b10525952333b20810e8eb9) --- qa/standalone/scrub/osd-scrub-test.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/qa/standalone/scrub/osd-scrub-test.sh b/qa/standalone/scrub/osd-scrub-test.sh index 10b68fda196..3c0973d7267 100755 --- a/qa/standalone/scrub/osd-scrub-test.sh +++ b/qa/standalone/scrub/osd-scrub-test.sh @@ -483,6 +483,7 @@ function TEST_just_deep_scrubs() { # set both 'no scrub' & 'no deep-scrub', then request a deep-scrub. # we do not expect to see the scrub scheduled. + ceph tell osd.* config set osd_scrub_retry_after_noscrub 2 ceph osd set noscrub || return 1 ceph osd set nodeep-scrub || return 1 sleep 6 # the 'noscrub' command takes a long time to reach the OSDs @@ -509,10 +510,14 @@ function TEST_just_deep_scrubs() { # unset the 'no deep-scrub'. Deep scrubbing should start now. ceph osd unset nodeep-scrub || return 1 - sleep 5 + sleep 8 declare -A expct_qry_duration=( ['query_last_duration']="0" ['query_last_duration_neg']="not0" ) sc_data_2=() + extract_published_sch $pgid $now_is $now_is sc_data_2 echo "test counter @ should be higher than before the unset: " ${sc_data_2['query_scrub_seq']} + + declare -A expct_qry_duration=( ['query_last_duration']="0" ['query_last_duration_neg']="not0" ) + sc_data_2=() wait_any_cond $pgid 10 $saved_last_stamp expct_qry_duration "WaitingAfterScrub " sc_data_2 || return 1 perf_counters $dir ${cluster_conf['osds_num']} } -- 2.39.5