From b1738cd1ef04f05bd142365d708802e766d39cb8 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 8 Apr 2020 00:53:55 +0800 Subject: [PATCH] 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 --- qa/standalone/scrub/osd-scrub-repair.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qa/standalone/scrub/osd-scrub-repair.sh b/qa/standalone/scrub/osd-scrub-repair.sh index 12981dd8fae72..eb994c9fba33d 100755 --- a/qa/standalone/scrub/osd-scrub-repair.sh +++ b/qa/standalone/scrub/osd-scrub-repair.sh @@ -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 -- 2.39.5