From f52b9d19f2bc7438afeec8d69d469fb51aeac021 Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Tue, 18 Apr 2017 22:54:04 -0700 Subject: [PATCH] qa: use bluestore for cephfs cephtool tests This lets the tests enable ec overwrites Signed-off-by: Josh Durgin --- src/test/cephtool-test-mds.sh | 2 +- src/test/vstart_wrapper.sh | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/test/cephtool-test-mds.sh b/src/test/cephtool-test-mds.sh index 93ea99b4f85..90f309c0427 100755 --- a/src/test/cephtool-test-mds.sh +++ b/src/test/cephtool-test-mds.sh @@ -18,7 +18,7 @@ source $(dirname $0)/detect-build-env-vars.sh CEPH_CLI_TEST_DUP_COMMAND=1 \ -MDS=1 MON=1 OSD=3 MGR=0 CEPH_PORT=7200 $CEPH_ROOT/src/test/vstart_wrapper.sh \ +MDS=1 MON=1 OSD=3 MGR=0 CEPH_PORT=7200 CEPH_OBJECTSTORE="bluestore" $CEPH_ROOT/src/test/vstart_wrapper.sh \ $CEPH_ROOT/qa/workunits/cephtool/test.sh \ --test-mds \ --asok-does-not-need-root diff --git a/src/test/vstart_wrapper.sh b/src/test/vstart_wrapper.sh index 62cd6e16b8a..17fd9836f66 100755 --- a/src/test/vstart_wrapper.sh +++ b/src/test/vstart_wrapper.sh @@ -30,8 +30,13 @@ function vstart_setup() trap "teardown $CEPH_DIR" EXIT export LC_ALL=C # some tests are vulnerable to i18n export PATH="$(pwd):${PATH}" + OBJSTORE_ARGS="" + if [ "bluestore" = "${CEPH_OBJECTSTORE}" ]; then + OBJSTORE_ARGS="-b" + fi $CEPH_ROOT/src/vstart.sh \ --short \ + $OBJSTORE_ARGS \ -o 'paxos propose interval = 0.01' \ -n -l || return 1 export CEPH_CONF=$CEPH_DIR/ceph.conf -- 2.39.5