From efb67445c2480fce4b5a7252811a544b8a74772f Mon Sep 17 00:00:00 2001 From: Igor Fedotov Date: Tue, 28 Sep 2021 19:52:37 +0300 Subject: [PATCH] qa/osd-bluefs-volume-ops: retry data writing if spillover hasn't happened. Fixes: https://tracker.ceph.com/issues/52676 Signed-off-by: Igor Fedotov --- qa/standalone/osd/osd-bluefs-volume-ops.sh | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/qa/standalone/osd/osd-bluefs-volume-ops.sh b/qa/standalone/osd/osd-bluefs-volume-ops.sh index 3e92d17dba3e..c0235ef6772e 100755 --- a/qa/standalone/osd/osd-bluefs-volume-ops.sh +++ b/qa/standalone/osd/osd-bluefs-volume-ops.sh @@ -365,13 +365,19 @@ function TEST_bluestore2() { sleep 5 create_pool foo 16 - # write some objects - timeout 60 rados bench -p foo 10 write --write-omap --no-cleanup #|| return 1 - - #give RocksDB some time to cooldown and put files to slow level(s) - sleep 10 - - spilled_over=$( ceph tell osd.0 perf dump bluefs | jq ".bluefs.slow_used_bytes" ) + retry = 0 + while [[ $retry -le 5 ]]; do + # write some objects + timeout 60 rados bench -p foo 10 write --write-omap --no-cleanup #|| return 1 + + #give RocksDB some time to cooldown and put files to slow level(s) + sleep 10 + + db_used=$( ceph tell osd.0 perf dump bluefs | jq ".bluefs.db_used_bytes" ) + spilled_over=$( ceph tell osd.0 perf dump bluefs | jq ".bluefs.slow_used_bytes" ) + ((retry+=1)) + test $spilled_over -eq 0 || break + done test $spilled_over -gt 0 || return 1 while kill $osd_pid0; do sleep 1 ; done -- 2.47.3