Commit da5c4e09 authored Jul 09, 2020 by Karol Latecki Committed by Tomasz Zawadzki Jul 22, 2020

test/nvme_perf: reorganize fio config generation



Previous changes moved some of the fio CLI parameters into
a bash heredoc to save into a text file, but it was put in
wrong place in the script.

Move global fio parameters a couple lines up so that the
resulting fio config file has the correct form of:
[global]
  global_params
[testjob]
  testjob_params

Signed-off-by: Karol Latecki <karol.latecki@intel.com>
Change-Id: I3a958fe5ce880ab63a079c345e6b24fd1d3bae32
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3293


Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Michal Berger <michalx.berger@intel.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>

parent 3ef00ffb

test/nvme/perf/run_perf.sh

+1 −2

Original line number	Diff line number	Diff line
		@@ -126,9 +126,7 @@ for ((j = 0; j < REPEAT_NO; j++)); do

		cp $NVME_FIO_RESULTS $result_dir/perf_results_${MIX}_${PLUGIN}_${NO_CORES}cpus_${DATE}_${k}_disks_${j}.output
		else
		create_fio_config $k $PLUGIN "$DISK_NAMES" "$DISKS_NUMA" "$CORES"
		desc="Running Test: Blocksize=${BLK_SIZE} Workload=$RW MIX=${MIX} qd=${IODEPTH} io_plugin/driver=$PLUGIN"

		cat <<- EOF >> $BASE_DIR/config.fio
		rw=$RW
		rwmixread=$MIX
		@@ -142,6 +140,7 @@ for ((j = 0; j < REPEAT_NO; j++)); do
		log_avg_msec=250
		EOF

		create_fio_config $k $PLUGIN "$DISK_NAMES" "$DISKS_NUMA" "$CORES"
		echo "USING CONFIG:"
		cat $BASE_DIR/config.fio

Admin message