test/vhost_perf: Drop .ini config in favor of json

Signed-off-by: Michal Berger <michalx.berger@intel.com>
Change-Id: Ida15585aa2c16e03f000ca115babc8a5a3629fe8
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1284
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
This commit is contained in:
Michal Berger 2020-03-16 15:20:22 +01:00 committed by Tomasz Zawadzki
parent 9cb8c2387a
commit 524b0ddb46

View File

@ -203,13 +203,18 @@ fi
if [[ $run_precondition == true ]]; then
# Using the same precondition routine possible for lvols thanks
# to --clear-method option. Lvols should not UNMAP on creation.
$rootdir/scripts/gen_nvme.sh > $rootdir/nvme.cfg
mapfile -t nvmes < <(grep -oP "Nvme\d+" $rootdir/nvme.cfg)
json_cfg=$rootdir/nvme.json
cat <<-JSON >"$json_cfg"
{"subsystems":[
$("$rootdir/scripts/gen_nvme.sh" --json)
]}
JSON
mapfile -t nvmes < <(grep -oP "Nvme\d+" "$json_cfg")
fio_filename=$(printf ":%sn1" "${nvmes[@]}")
fio_filename=${fio_filename:1}
$precond_fio_bin --name="precondition" \
--ioengine="${rootdir}/examples/bdev/fio_plugin/fio_plugin" \
--rw="write" --spdk_conf="${rootdir}/nvme.cfg" --thread="1" \
--rw="write" --spdk_json_conf="$json_cfg" --thread="1" \
--group_reporting --direct="1" --size="100%" --loops="2" --bs="256k" \
--iodepth=32 --filename="${fio_filename}" || true
fi