From: Ronen Friedman <rfriedma@redhat.com>
Date: Sun, 25 Aug 2024 08:57:42 +0000 (-0500)
Subject: test/osd/scrub: fix searched-for log string
X-Git-Tag: v20.0.0~1219^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F58858%2Fhead;p=ceph.git

test/osd/scrub: fix searched-for log string

To match the modified log message in
OsdScrub::restrictions_on_scrubbing().

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
---

diff --git a/qa/standalone/scrub/osd-recovery-scrub.sh b/qa/standalone/scrub/osd-recovery-scrub.sh
index 1f4319e3ad5d..7c1864073b0b 100755
--- a/qa/standalone/scrub/osd-recovery-scrub.sh
+++ b/qa/standalone/scrub/osd-recovery-scrub.sh
@@ -99,11 +99,11 @@ function TEST_recovery_scrub_1() {
     kill_daemons $dir #|| return 1
 
     declare -a err_strings
-    err_strings[0]="recovery in progress. Only high priority scrubs allowed."
+    err_strings[0]="recovery in progress.*scrubs"
 
     for osd in $(seq 0 $(expr $OSDS - 1))
     do
-        grep "recovery in progress. Only high priority scrubs allowed." $dir/osd.${osd}.log
+        grep "recovery in progress.*scrubs" $dir/osd.${osd}.log
     done
     for err_string in "${err_strings[@]}"
     do
@@ -269,7 +269,7 @@ function TEST_recovery_scrub_2() {
     ceph pg dump pgs
 
     # note that the following will be needed if the mclock scheduler is specified
-    #ceph tell osd.* config get osd_mclock_override_recovery_settings
+    ceph tell osd.* config get osd_mclock_override_recovery_settings
 
     # the '_max_active' is expected to be 0
     ceph tell osd.1 config get osd_recovery_max_active
@@ -327,11 +327,11 @@ function TEST_recovery_scrub_2() {
     kill_daemons $dir #|| return 1
 
     declare -a err_strings
-    err_strings[0]="not scheduling scrubs due to active recovery"
-
+    ## we do not expect a refusal to scrub
+    err_strings[0]="recovery in progress.*scrubs"
     for osd in $(seq 0 $(expr $OSDS - 1))
     do
-        grep "not scheduling scrubs" $dir/osd.${osd}.log
+        grep "recovery in progress.*scrubs" $dir/osd.${osd}.log
     done
     for err_string in "${err_strings[@]}"
     do