]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/standalone/scrub/osd-scrub-repair.sh: fix race in TEST_auto_repair_bluestore_failed
authorNeha Ojha <nojha@redhat.com>
Thu, 16 Apr 2020 23:00:23 +0000 (23:00 +0000)
committerNathan Cutler <ncutler@suse.com>
Wed, 29 Apr 2020 12:16:47 +0000 (14:16 +0200)
We need to flush_pg_stats before checking for active+clean.

Fixed: https://tracker.ceph.com/issues/45075
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 4f82ebf41b0150a77083c665e7cac8678a31fb09)

Conflicts:
        qa/standalone/scrub/osd-scrub-repair.sh

qa/standalone/scrub/osd-scrub-repair.sh

index 12981dd8fae7245a1a6226554b11ff3c2215f26a..56d6f76f9a6a991d2e2a49b2055699ddaaf0a625 100755 (executable)
@@ -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