From: Sage Weil <sage@redhat.com>
Date: Fri, 10 Mar 2017 04:17:20 +0000 (-0500)
Subject: test/osd/osd-scrub-repair.sh: cope with mon/mgr asynchrony
X-Git-Tag: v12.0.2~252^2~34
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f5681ffc5a6186143a366b8a0e5a653c2d6f609d;p=ceph.git

test/osd/osd-scrub-repair.sh: cope with mon/mgr asynchrony

Need to wait for mon to reflect pg state as reported by
mgr.

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

diff --git a/src/test/osd/osd-scrub-repair.sh b/src/test/osd/osd-scrub-repair.sh
index b98ef9903404..866383eb111a 100755
--- a/src/test/osd/osd-scrub-repair.sh
+++ b/src/test/osd/osd-scrub-repair.sh
@@ -313,6 +313,11 @@ function TEST_unfound_erasure_coded() {
     #
     # 3) check pg state
     #
+    # it may take a bit to appear due to mon/mgr asynchrony
+    for f in `seq 1 60`; do
+	ceph -s | grep "1/1 unfound" && break
+	sleep 1
+    done
     ceph -s|grep "4 osds: 4 up, 4 in" || return 1
     ceph -s|grep "1/1 unfound" || return 1