From 43b1129030823817e0b7a21c85de5d3da841510a Mon Sep 17 00:00:00 2001 From: Ronen Friedman Date: Mon, 7 Dec 2020 14:41:45 +0200 Subject: [PATCH] test: cancelling both noscrub *and* nodeep-scrub as part of osd-scrub-test.sh. Signed-off-by: Ronen Friedman --- qa/standalone/scrub/osd-scrub-test.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/qa/standalone/scrub/osd-scrub-test.sh b/qa/standalone/scrub/osd-scrub-test.sh index 624c1dd217d..5dd029c356f 100755 --- a/qa/standalone/scrub/osd-scrub-test.sh +++ b/qa/standalone/scrub/osd-scrub-test.sh @@ -351,6 +351,10 @@ function _scrub_abort() { fi ceph osd set $stopscrub + if [ "$type" = "deep_scrub" ]; + then + ceph osd set noscrub + fi # Wait for scrubbing to end set -o pipefail @@ -375,7 +379,13 @@ function _scrub_abort() { fi local last_scrub=$(get_last_scrub_stamp $pgid) - ceph osd unset noscrub + ceph config set osd "osd_scrub_sleep" "0.1" + + ceph osd unset $stopscrub + if [ "$type" = "deep_scrub" ]; + then + ceph osd unset noscrub + fi TIMEOUT=$(($objects / 2)) wait_for_scrub $pgid "$last_scrub" || return 1 -- 2.39.5