Merge pull request #34451 from tchaikov/wip-standalone-pgid

qa/standalone/scrub: s/$(pgid)/${pgid}/

Reviewed-by: Neha Ojha <nojha@redhat.com>
This commit is contained in:
Kefu Chai 2020-04-08 12:50:47 +08:00 committed by GitHub
commit e4cad106cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -480,7 +480,7 @@ function TEST_auto_repair_bluestore_failed() {
grep scrub_finish $dir/osd.${primary}.log
grep -q "scrub_finish.*still present after re-scrub" $dir/osd.${primary}.log || return 1
ceph pg dump pgs
ceph pg dump pgs | grep -q "^$(pgid).*+failed_repair" || return 1
ceph pg dump pgs | grep -q "^${pgid}.*+failed_repair" || return 1
# Verify - obj1 should be back
# Restarted osd get $ceph_osd_args passed
@ -495,7 +495,7 @@ function TEST_auto_repair_bluestore_failed() {
sleep 2
ceph pg dump pgs
ceph pg dump pgs | grep -q "^$(pgid).* active+clean " || return 1
ceph pg dump pgs | grep -q "^${pgid}.* active+clean " || return 1
grep scrub_finish $dir/osd.${primary}.log
# Tear down
@ -550,7 +550,7 @@ function TEST_auto_repair_bluestore_failed_norecov() {
flush_pg_stats
grep -q "scrub_finish.*present with no repair possible" $dir/osd.${primary}.log || return 1
ceph pg dump pgs
ceph pg dump pgs | grep -q "^$(pgid).*+failed_repair" || return 1
ceph pg dump pgs | grep -q "^${pgid}.*+failed_repair" || return 1
# Tear down
teardown $dir || return 1