From: xie xingguo Date: Fri, 21 Jul 2017 02:34:07 +0000 (+0800) Subject: test: s/osd_objectstore_type/osd_objectstore/ X-Git-Tag: v12.1.2~115^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fa0e314cdee067f462280cf666ea3bc527ea153d;p=ceph.git test: s/osd_objectstore_type/osd_objectstore/ Signed-off-by: xie xingguo --- diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh index f23ec5ee7e2..1b252706545 100755 --- a/qa/workunits/cephtool/test.sh +++ b/qa/workunits/cephtool/test.sh @@ -1678,10 +1678,10 @@ function test_mon_osd_pool() ceph osd pool create ec_test 1 1 erasure ceph osd pool application enable ec_test rados set +e - ceph osd metadata | grep osd_objectstore_type | grep -qc bluestore - if [ $? -eq 0 ]; then + ceph osd count-metadata osd_objectstore | grep 'bluestore' + if [ $? -eq 1 ]; then # enable ec_overwrites on non-bluestore pools should fail ceph osd pool set ec_test allow_ec_overwrites true >& $TMPFILE - check_response $? 22 "pool must only be stored on bluestore for scrubbing to work" + check_response "pool must only be stored on bluestore for scrubbing to work" $? 22 else ceph osd pool set ec_test allow_ec_overwrites true || return 1 expect_false ceph osd pool set ec_test allow_ec_overwrites false