From d4915ee50379b4eddf387037b531673e587f72ac Mon Sep 17 00:00:00 2001 From: David Zafman Date: Mon, 11 Mar 2019 15:30:28 -0700 Subject: [PATCH] qa: Don't create rbd pool because it creates an object This also reverts commit 10b9626ea7b09e7c124067a2ce08a76eea073c9c. Fixes: http://tracker.ceph.com/issues/38631 Signed-off-by: David Zafman --- qa/standalone/scrub/osd-scrub-repair.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/qa/standalone/scrub/osd-scrub-repair.sh b/qa/standalone/scrub/osd-scrub-repair.sh index 9f285d5cd79d1..a81ad10e366c2 100755 --- a/qa/standalone/scrub/osd-scrub-repair.sh +++ b/qa/standalone/scrub/osd-scrub-repair.sh @@ -350,8 +350,6 @@ function unfound_erasure_coded() { run_osd $dir $id || return 1 fi done - create_rbd_pool || return 1 - wait_for_clean || return 1 create_ec_pool $poolname $allow_overwrites k=2 m=2 || return 1 @@ -384,12 +382,12 @@ function unfound_erasure_coded() { # # it may take a bit to appear due to mon/mgr asynchrony for f in `seq 1 60`; do - ceph -s | grep "1/2 objects unfound" && break + ceph -s | grep "1/1 objects unfound" && break sleep 1 done ceph -s|grep "4 up" || return 1 ceph -s|grep "4 in" || return 1 - ceph -s|grep "1/2 objects unfound" || return 1 + ceph -s|grep "1/1 objects unfound" || return 1 teardown $dir || return 1 } -- 2.39.5