From: Neha Ojha Date: Thu, 23 Apr 2020 20:24:28 +0000 (+0000) Subject: qa/*/osd-scrub-repair.sh: don't fail if PG is in active+clean+wait X-Git-Tag: v16.1.0~2491^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F34602%2Fhead;p=ceph.git qa/*/osd-scrub-repair.sh: don't fail if PG is in active+clean+wait a0b453ad335671bd92f165115d6ee984d2412448 added the wait state, which can make PGs stay in active+clean+wait for a while instead of going into active+clean directly. As far as TEST_auto_repair_bluestore_failed is concerned, we only care about the repair state being cleared. Fixes: https://tracker.ceph.com/issues/45075 Signed-off-by: Neha Ojha --- diff --git a/qa/standalone/scrub/osd-scrub-repair.sh b/qa/standalone/scrub/osd-scrub-repair.sh index f8a2b30d5f5cb..3df2ec3f6a76c 100755 --- a/qa/standalone/scrub/osd-scrub-repair.sh +++ b/qa/standalone/scrub/osd-scrub-repair.sh @@ -496,7 +496,7 @@ function TEST_auto_repair_bluestore_failed() { flush_pg_stats ceph pg dump pgs - ceph pg dump pgs | grep -q "^${pgid}.* active+clean " || return 1 + ceph pg dump pgs | grep -q -e "^${pgid}.* active+clean " -e "^${pgid}.* active+clean+wait " || return 1 grep scrub_finish $dir/osd.${primary}.log # Tear down