From a960f2faa755a7a4ccf26af61f4cd43b5c3c14d5 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 4 Jul 2019 18:27:37 -0500 Subject: [PATCH] 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 --- qa/standalone/scrub/osd-scrub-repair.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 } -- 2.39.5