From b9e8232b27c8cfc42e4dc4cf18e4f51e2d466a0a Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 20 Jan 2020 13:24:12 -0600 Subject: [PATCH] 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 (cherry picked from commit 76ea774c109cc565c0b85feed40f7f29105029d3) --- qa/standalone/misc/ok-to-stop.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 -- 2.47.3