]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
test/scrub: fix osd-recovery-scrub.sh to look for correct log message 54828/head
authorRonen Friedman <rfriedma@redhat.com>
Mon, 11 Dec 2023 07:30:06 +0000 (01:30 -0600)
committerRonen Friedman <rfriedma@redhat.com>
Mon, 11 Dec 2023 07:30:06 +0000 (01:30 -0600)
... matching the code changes in the previous commit.

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
qa/standalone/scrub/osd-recovery-scrub.sh

index 14c98c5e8f62be6e15ba74decebb61ca96935373..3d3121fe8d80cb177a19f30128f7eb0a924daa07 100755 (executable)
@@ -33,7 +33,7 @@ function run() {
     done
 }
 
-# Simple test for "not scheduling scrubs due to active recovery"
+# Simple test for "recovery in progress. Only high priority scrubs allowed."
 # OSD::sched_scrub() called on all OSDs during ticks
 function TEST_recovery_scrub_1() {
     local dir=$1
@@ -99,11 +99,11 @@ function TEST_recovery_scrub_1() {
     kill_daemons $dir #|| return 1
 
     declare -a err_strings
-    err_strings[0]="not scheduling scrubs due to active recovery"
+    err_strings[0]="recovery in progress. Only high priority scrubs allowed."
 
     for osd in $(seq 0 $(expr $OSDS - 1))
     do
-        grep "not scheduling scrubs" $dir/osd.${osd}.log
+        grep "recovery in progress. Only high priority scrubs allowed." $dir/osd.${osd}.log
     done
     for err_string in "${err_strings[@]}"
     do