From 44f9b48bd4cae0c3df8e0d838a1e3ecca14a10c4 Mon Sep 17 00:00:00 2001 From: Ronen Friedman Date: Thu, 10 Jul 2025 02:57:37 -0500 Subject: [PATCH] qa/standalone/scrub: fix "scrubbed in 0ms" in osd-scrub-test.sh The specific test looks for a 'last scrub duration' higher than 0 as a sign that the scrub actually ran. Previous code fixes guaranteed that even a scrub duration as low as 1ms would be reported as "1" (1s). However, none of the 15 objects created in this test were designated for the tested PG, which remained empty. As a result, the scrub duration was reported as "0". The fix is to create a large enough number of objects so that at least one of them is mapped to the tested PG. Fixes: https://tracker.ceph.com/issues/71801 Signed-off-by: Ronen Friedman (cherry picked from commit b303afed7a8b2a65043f56170ed478f8d2bc591a) --- qa/standalone/scrub/osd-scrub-test.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/qa/standalone/scrub/osd-scrub-test.sh b/qa/standalone/scrub/osd-scrub-test.sh index 3c0973d726711..dffcfb58a64c3 100755 --- a/qa/standalone/scrub/osd-scrub-test.sh +++ b/qa/standalone/scrub/osd-scrub-test.sh @@ -472,7 +472,7 @@ function TEST_just_deep_scrubs() { echo "Pool: $poolname : $poolid" TESTDATA="testdata.$$" - local objects=15 + local objects=90 dd if=/dev/urandom of=$TESTDATA bs=1032 count=1 for i in `seq 1 $objects` do @@ -502,6 +502,10 @@ function TEST_just_deep_scrubs() { ceph tell $pgid schedule-deep-scrub sleep 5 # 5s is the 'pg dump' interval + + ceph pg dump pgs --format=json-pretty | jq -r '.pg_stats[] | "\(.pgid) \(.stat_sum.num_objects)"' + echo "Objects # in pg $pgid: " $(ceph pg $pgid query --format=json-pretty | jq -r '.info.stats.stat_sum.num_objects') + declare -A sc_data_2 extract_published_sch $pgid $now_is $now_is sc_data_2 echo "test counter @ should show no change: " ${sc_data_2['query_scrub_seq']} @@ -526,7 +530,7 @@ function TEST_dump_scrub_schedule() { local dir=$1 local poolname=test local OSDS=3 - local objects=15 + local objects=90 TESTDATA="testdata.$$" -- 2.39.5