From: Ronen Friedman <rfriedma@redhat.com>
Date: Fri, 12 Nov 2021 18:43:41 +0000 (+0000)
Subject: qa/standalone: fix scrub/osd-scrub-dump following changes to 'pg dump pgs' output
X-Git-Tag: v17.1.0~434^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9dda986bd52e3777e3b38ae033d035641f9a65af;p=ceph-ci.git

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 <rfriedma@redhat.com>
---

diff --git a/qa/standalone/scrub/osd-scrub-dump.sh b/qa/standalone/scrub/osd-scrub-dump.sh
index 092e4ef6ead..21808aa9172 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