From 8b12a6f5db86b506fad6a325267212de378b311b Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 8 Mar 2019 18:07:10 -0600 Subject: [PATCH] qa/standalone/ceph-helpers: fix test_wait_for_clean Signed-off-by: Sage Weil (cherry picked from commit 30fc7f5e972bd41537c92eb135c9763b46dd09d2) Conflicts: qa/standalone/ceph-helpers.sh - mimic does not have separate WAIT_FOR_CLEAN_TIMEOUT --- qa/standalone/ceph-helpers.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qa/standalone/ceph-helpers.sh b/qa/standalone/ceph-helpers.sh index 65fd6ddf6ef..0628a452847 100755 --- a/qa/standalone/ceph-helpers.sh +++ b/qa/standalone/ceph-helpers.sh @@ -1464,12 +1464,12 @@ function test_wait_for_clean() { local dir=$1 setup $dir || return 1 - run_mon $dir a --osd_pool_default_size=1 || return 1 + run_mon $dir a --osd_pool_default_size=2 || return 1 run_osd $dir 0 || return 1 run_mgr $dir x || return 1 create_rbd_pool || return 1 ! TIMEOUT=1 wait_for_clean || return 1 - run_osd $dir 0 || return 1 + run_osd $dir 1 || return 1 wait_for_clean || return 1 teardown $dir || return 1 } -- 2.47.3