From: Sage Weil <sage@redhat.com>
Date: Mon, 20 Jan 2020 19:24:12 +0000 (-0600)
Subject: qa/standalone/misc/ok-to-stop: improve test
X-Git-Tag: v14.2.8~10^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F32844%2Fhead;p=ceph.git

qa/standalone/misc/ok-to-stop: improve test

Make sure PGs peer (simply flushing state to mon isn't enough).

Fixes: https://tracker.ceph.com/issues/43721
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 76ea774c109cc565c0b85feed40f7f29105029d3)
---

diff --git a/qa/standalone/misc/ok-to-stop.sh b/qa/standalone/misc/ok-to-stop.sh
index 77f6b8df8c78..5465939e8e8a 100755
--- a/qa/standalone/misc/ok-to-stop.sh
+++ b/qa/standalone/misc/ok-to-stop.sh
@@ -256,7 +256,7 @@ function TEST_0_osd() {
 
     # with min_size 3, we can stop only 1 osd
     ceph osd pool set ec min_size 3 || return 1
-    flush_pg_stats || return 1
+    wait_for_clean || return 1
 
     ceph osd ok-to-stop 0 || return 1
     ceph osd ok-to-stop 1 || return 1
@@ -267,7 +267,7 @@ function TEST_0_osd() {
 
     # with min_size 2 we can stop 1 osds
     ceph osd pool set ec min_size 2 || return 1
-    flush_pg_stats || return 1
+    wait_for_clean || return 1
 
     ceph osd ok-to-stop 0 1 || return 1
     ceph osd ok-to-stop 2 3 || return 1
@@ -277,7 +277,7 @@ function TEST_0_osd() {
     # we should get the same result with one of the osds already down
     kill_daemons $dir TERM osd.0 || return 1
     ceph osd down 0 || return 1
-    flush_pg_stats || return 1
+    wait_for_peered || return 1
 
     ceph osd ok-to-stop 0 || return 1
     ceph osd ok-to-stop 0 1 || return 1