From 6d2e023cb5aa932c4d273c11e62dea17c1b06ad9 Mon Sep 17 00:00:00 2001 From: Neha Ojha Date: Thu, 16 Apr 2020 23:00:23 +0000 Subject: [PATCH] qa/standalone/scrub/osd-scrub-repair.sh: fix race in TEST_auto_repair_bluestore_failed We need to flush_pg_stats before checking for active+clean. Fixed: https://tracker.ceph.com/issues/45075 Signed-off-by: Neha Ojha (cherry picked from commit 4f82ebf41b0150a77083c665e7cac8678a31fb09) Conflicts: qa/standalone/scrub/osd-scrub-repair.sh --- qa/standalone/scrub/osd-scrub-repair.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/qa/standalone/scrub/osd-scrub-repair.sh b/qa/standalone/scrub/osd-scrub-repair.sh index 12981dd8fae72..56d6f76f9a6a9 100755 --- a/qa/standalone/scrub/osd-scrub-repair.sh +++ b/qa/standalone/scrub/osd-scrub-repair.sh @@ -494,6 +494,7 @@ function TEST_auto_repair_bluestore_failed() { repair $pgid sleep 2 + flush_pg_stats ceph pg dump pgs ceph pg dump pgs | grep -q "^$(pgid).* active+clean " || return 1 grep scrub_finish $dir/osd.${primary}.log -- 2.39.5