From bf74c1adc4c5df7b11217eebfbfa2f6d81bdd357 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 8 Mar 2019 17:06:05 -0600 Subject: [PATCH] qa/standalone/osd/osd-rep-recov-eio: fix better - no need for the default pool size - no initial osds or it will collide with setup_osds later - no need for rbd pool at all Signed-off-by: Sage Weil --- qa/standalone/osd/osd-rep-recov-eio.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/qa/standalone/osd/osd-rep-recov-eio.sh b/qa/standalone/osd/osd-rep-recov-eio.sh index 6f4dac2a6b5..de35bc18b07 100755 --- a/qa/standalone/osd/osd-rep-recov-eio.sh +++ b/qa/standalone/osd/osd-rep-recov-eio.sh @@ -27,15 +27,14 @@ function run() { export CEPH_ARGS CEPH_ARGS+="--fsid=$(uuidgen) --auth-supported=none " CEPH_ARGS+="--mon-host=$CEPH_MON " - CEPH_ARGS+="--osd-objectstore=filestore --osd_pool_default_size=1 " + CEPH_ARGS+="--osd-objectstore=filestore " local funcs=${@:-$(set | sed -n -e 's/^\(TEST_[0-9a-z_]*\) .*/\1/p')} for func in $funcs ; do setup $dir || return 1 run_mon $dir a || return 1 run_mgr $dir x || return 1 - run_osd $dir 0 || return 1 - create_rbd_pool || return 1 + ceph osd pool create foo 8 || return 1 $func $dir || return 1 teardown $dir || return 1 @@ -301,7 +300,7 @@ function TEST_rep_read_unfound() { setup_osds 3 || return 1 - ceph osd pool delete rbd rbd --yes-i-really-really-mean-it || return 1 + ceph osd pool delete foo foo --yes-i-really-really-mean-it || return 1 local poolname=test-pool create_pool $poolname 1 1 || return 1 ceph osd pool set $poolname size 2 -- 2.39.5