From: Sage Weil <sage@redhat.com>
Date: Sun, 8 Mar 2020 19:52:10 +0000 (-0500)
Subject: qa/standalone/scrub/osd-scrub-repair: force osdmap prop to osds
X-Git-Tag: v15.1.1~57^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F33809%2Fhead;p=ceph.git

qa/standalone/scrub/osd-scrub-repair: force osdmap prop to osds

flush_pg_stats isn't sufficient to ensure that OSDs have the latest
OSDMap.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/standalone/scrub/osd-scrub-repair.sh b/qa/standalone/scrub/osd-scrub-repair.sh
index 287d970132e..c8196b2b7b6 100755
--- a/qa/standalone/scrub/osd-scrub-repair.sh
+++ b/qa/standalone/scrub/osd-scrub-repair.sh
@@ -5758,6 +5758,7 @@ function TEST_periodic_scrub_replicated() {
     # Can't upgrade with this set
     ceph osd set nodeep-scrub
     # Let map change propagate to OSDs
+    ceph tell osd.0 get_latest_osdmap
     flush_pg_stats
     sleep 5