From: David Zafman <dzafman@redhat.com>
Date: Fri, 6 Mar 2020 04:25:37 +0000 (+0000)
Subject: test: Add flush_pg_stats to avoid race with getting num_shards_repaired
X-Git-Tag: v15.1.1~65^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e509b7c7d0d762c20927720b08d3a5b1f8980fb4;p=ceph.git

test: Add flush_pg_stats to avoid race with getting num_shards_repaired

Fixes: https://tracker.ceph.com/issues/44439

Signed-off-by: David Zafman <dzafman@redhat.com>
---

diff --git a/qa/standalone/scrub/osd-scrub-repair.sh b/qa/standalone/scrub/osd-scrub-repair.sh
index 287d970132e..8eccae3dc20 100755
--- a/qa/standalone/scrub/osd-scrub-repair.sh
+++ b/qa/standalone/scrub/osd-scrub-repair.sh
@@ -607,6 +607,7 @@ function TEST_repair_stats() {
     repair $pgid
     wait_for_clean || return 1
     ceph pg dump pgs
+    flush_pg_stats
 
     # This should have caused 1 object to be repaired
     ceph pg $pgid query | jq '.info.stats.stat_sum'
@@ -680,6 +681,7 @@ function TEST_repair_stats_ec() {
     repair $pgid
     wait_for_clean || return 1
     ceph pg dump pgs
+    flush_pg_stats
 
     # This should have caused 1 object to be repaired
     ceph pg $pgid query | jq '.info.stats.stat_sum'