From 9dda986bd52e3777e3b38ae033d035641f9a65af Mon Sep 17 00:00:00 2001 From: Ronen Friedman Date: Fri, 12 Nov 2021 18:43:41 +0000 Subject: [PATCH] qa/standalone: fix scrub/osd-scrub-dump following changes to 'pg dump pgs' output Make osd-scrub-dump test ignore the 'scrubbing' that might be late to disappear from the modified (PR #43403) 'pg dump' output. Signed-off-by: Ronen Friedman --- qa/standalone/scrub/osd-scrub-dump.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qa/standalone/scrub/osd-scrub-dump.sh b/qa/standalone/scrub/osd-scrub-dump.sh index 092e4ef6eadc4..21808aa9172d0 100755 --- a/qa/standalone/scrub/osd-scrub-dump.sh +++ b/qa/standalone/scrub/osd-scrub-dump.sh @@ -104,7 +104,7 @@ function TEST_recover_unexpected() { for i in $(seq 0 300) do ceph pg dump pgs - if ceph pg dump pgs | grep scrubbing; then + if ceph pg dump pgs | grep '+scrubbing'; then ok=true break fi @@ -144,7 +144,7 @@ function TEST_recover_unexpected() { # Check that there are no more scrubs for i in $(seq 0 5) do - if ceph pg dump pgs | grep scrubbing; then + if ceph pg dump pgs | grep '+scrubbing'; then echo "ERROR: Extra scrubs after test completion...not expected" return 1 fi -- 2.47.3