Skip to content

Commit b303afe

Browse files
committed
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 <[email protected]>
1 parent 99def68 commit b303afe

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

qa/standalone/scrub/osd-scrub-test.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ function TEST_just_deep_scrubs() {
472472
echo "Pool: $poolname : $poolid"
473473

474474
TESTDATA="testdata.$$"
475-
local objects=15
475+
local objects=90
476476
dd if=/dev/urandom of=$TESTDATA bs=1032 count=1
477477
for i in `seq 1 $objects`
478478
do
@@ -502,6 +502,10 @@ function TEST_just_deep_scrubs() {
502502
ceph tell $pgid schedule-deep-scrub
503503

504504
sleep 5 # 5s is the 'pg dump' interval
505+
506+
ceph pg dump pgs --format=json-pretty | jq -r '.pg_stats[] | "\(.pgid) \(.stat_sum.num_objects)"'
507+
echo "Objects # in pg $pgid: " $(ceph pg $pgid query --format=json-pretty | jq -r '.info.stats.stat_sum.num_objects')
508+
505509
declare -A sc_data_2
506510
extract_published_sch $pgid $now_is $now_is sc_data_2
507511
echo "test counter @ should show no change: " ${sc_data_2['query_scrub_seq']}
@@ -526,7 +530,7 @@ function TEST_dump_scrub_schedule() {
526530
local dir=$1
527531
local poolname=test
528532
local OSDS=3
529-
local objects=15
533+
local objects=90
530534

531535
TESTDATA="testdata.$$"
532536

0 commit comments

Comments
 (0)