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 092e4ef6eadc4d6f53c624ec3bd68d49525090fe..21808aa9172d07f1f8906941a8e4415c6878f4b0 100755 (executable)
--- 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