]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
test: Add flush_pg_stats to avoid race with getting num_shards_repaired 35048/head
authorDavid Zafman <dzafman@redhat.com>
Fri, 6 Mar 2020 04:25:37 +0000 (04:25 +0000)
committerNathan Cutler <ncutler@suse.com>
Wed, 13 May 2020 15:41:58 +0000 (17:41 +0200)
Fixes: https://tracker.ceph.com/issues/44439
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit e509b7c7d0d762c20927720b08d3a5b1f8980fb4)

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

index 578998e5f6d6d8f4a26dae8982f4d962887045ed..517298097de23cccbac8b0edf1e6aeebd230807e 100755 (executable)
@@ -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'