From: Sage Weil <sage@redhat.com>
Date: Thu, 4 Jul 2019 23:27:37 +0000 (-0500)
Subject: qa/standalone/scrub/osd-scrub-repair: fix 'scrub ok' grep
X-Git-Tag: v15.1.0~2272^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a960f2faa755a7a4ccf26af61f4cd43b5c3c14d5;p=ceph-ci.git

qa/standalone/scrub/osd-scrub-repair: fix 'scrub ok' grep

The log now also has a 'purged_snaps scrub ok' message that (generally)
precedes the first scrubbed PG.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/standalone/scrub/osd-scrub-repair.sh b/qa/standalone/scrub/osd-scrub-repair.sh
index 351ae4ba798..d0f6d6eecde 100755
--- a/qa/standalone/scrub/osd-scrub-repair.sh
+++ b/qa/standalone/scrub/osd-scrub-repair.sh
@@ -6040,7 +6040,7 @@ function TEST_request_scrub_priority() {
     done
 
     # Verify that the requested scrub ran first
-    grep "log_channel.*scrub ok" $dir/osd.${primary}.log | head -1 | sed 's/.*[[]DBG[]]//' | grep -q $pg || return 1
+    grep "log_channel.*scrub ok" $dir/osd.${primary}.log | grep -v purged_snaps | head -1 | sed 's/.*[[]DBG[]]//' | grep -q $pg || return 1
 
     return 0
 }