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

to address the test failures like
```
2020-04-07T15:44:58.693 INFO:tasks.workunit.client.0.smithi049.stderr:/home/ubuntu/cephtest/clone.client.0/qa/standalone/scrub/osd-scrub-repair.sh:498: TEST_auto_repair_bluestore_failed:  ceph pg dump
pgs
2020-04-07T15:44:58.694 INFO:tasks.workunit.client.0.smithi049.stderr://home/ubuntu/cephtest/clone.client.0/qa/standalone/scrub/osd-scrub-repair.sh:498: TEST_auto_repair_bluestore_failed:  pgid
2020-04-07T15:44:58.694 INFO:tasks.workunit.client.0.smithi049.stderr:/home/ubuntu/cephtest/clone.client.0/qa/standalone/scrub/osd-scrub-repair.sh: line 498: pgid: command not found
```

Signed-off-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2020-04-08 00:53:55 +08:00
parent 6bc09c5041
commit 6fba221605

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