]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
qa/standalone/scrub/osd-scrub-repair: fix 'scrub ok' grep
authorSage Weil <sage@redhat.com>
Thu, 4 Jul 2019 23:27:37 +0000 (18:27 -0500)
committerSage Weil <sage@redhat.com>
Thu, 4 Jul 2019 23:27:37 +0000 (18:27 -0500)
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>
qa/standalone/scrub/osd-scrub-repair.sh

index 351ae4ba7980630ea9e8ec57fc4c68461a3ec2d1..d0f6d6eecdeea00d5dd9678d434615e28cd9f67c 100755 (executable)
@@ -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
 }