From 2ba21503232198628d88f2c9e75867dc3692f79a Mon Sep 17 00:00:00 2001 From: Neha Ojha Date: Thu, 23 Apr 2020 20:24:28 +0000 Subject: [PATCH] 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 (cherry picked from commit 7c8b627eaa478a97b5694704170336ed4fc40666) Conflicts: qa/standalone/scrub/osd-scrub-repair.sh --- qa/standalone/scrub/osd-scrub-repair.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa/standalone/scrub/osd-scrub-repair.sh b/qa/standalone/scrub/osd-scrub-repair.sh index 56d6f76f9a6a9..d5a5ee332d7d5 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 -- 2.39.5