Merge pull request #43912 from ronen-fr/wip-rf-test-dump

qa/standalone: fix osd-scrub-dump following changes to 'pg dump pgs' output

Reviewed-by: Samuel Just <sjust@redhat.com>
This commit is contained in:
Ronen Friedman 2021-11-16 17:58:07 +02:00 committed by GitHub
commit 2766946460
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -104,7 +104,7 @@ function TEST_recover_unexpected() {
for i in $(seq 0 300)
do
ceph pg dump pgs
if ceph pg dump pgs | grep scrubbing; then
if ceph pg dump pgs | grep '+scrubbing'; then
ok=true
break
fi
@ -144,7 +144,7 @@ function TEST_recover_unexpected() {
# Check that there are no more scrubs
for i in $(seq 0 5)
do
if ceph pg dump pgs | grep scrubbing; then
if ceph pg dump pgs | grep '+scrubbing'; then
echo "ERROR: Extra scrubs after test completion...not expected"
return 1
fi