From b5069cd01d6deeedad33b142d5465e88d6e110a3 Mon Sep 17 00:00:00 2001 From: Karol Latecki Date: Wed, 8 Jan 2020 14:17:13 +0100 Subject: [PATCH] test/nvme-perf: make date variable global This variable was hidden as lowercase var at the very end file while in fact it's used as global in the main script. Change-Id: I68d53d953a63a3f53a3129f1817c7108a38da4bc Signed-off-by: Karol Latecki Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/479814 Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Shuhei Matsumoto Reviewed-by: Maciej Wawryk Reviewed-by: Tomasz Zawadzki Reviewed-by: Pawel Kaminski --- test/nvme/perf/common.sh | 2 +- test/nvme/perf/run_perf.sh | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/nvme/perf/common.sh b/test/nvme/perf/common.sh index 03a7c5c4a..0a8bdeece 100755 --- a/test/nvme/perf/common.sh +++ b/test/nvme/perf/common.sh @@ -25,6 +25,7 @@ CPUS_ALLOWED=1 NOIOSCALING=false PRECONDITIONING=true ONEWORKLOAD=false +DATE="$(date +'%m_%d_%Y_%H%M%S')" function is_bdf_not_mounted() { local bdf=$1 @@ -396,7 +397,6 @@ done trap 'rm -f *.state $BASE_DIR/bdev.conf; print_backtrace' ERR SIGTERM SIGABRT mkdir -p $BASE_DIR/results -date="$(date +'%m_%d_%Y_%H%M%S')" if [[ $PLUGIN == "bdev" ]] || [[ $PLUGIN == "bdevperf" ]]; then $ROOT_DIR/scripts/gen_nvme.sh >> $BASE_DIR/bdev.conf fi diff --git a/test/nvme/perf/run_perf.sh b/test/nvme/perf/run_perf.sh index f41b1172c..f70309c65 100755 --- a/test/nvme/perf/run_perf.sh +++ b/test/nvme/perf/run_perf.sh @@ -96,9 +96,9 @@ elif [ $PLUGIN = "kernel-io-uring" ]; then done fi -result_dir=perf_results_${BLK_SIZE}BS_${IODEPTH}QD_${RW}_${MIX}MIX_${PLUGIN}_${date} +result_dir=perf_results_${BLK_SIZE}BS_${IODEPTH}QD_${RW}_${MIX}MIX_${PLUGIN}_${DATE} mkdir -p $BASE_DIR/results/$result_dir -result_file=$BASE_DIR/results/$result_dir/perf_results_${BLK_SIZE}BS_${IODEPTH}QD_${RW}_${MIX}MIX_${PLUGIN}_${date}.csv +result_file=$BASE_DIR/results/$result_dir/perf_results_${BLK_SIZE}BS_${IODEPTH}QD_${RW}_${MIX}MIX_${PLUGIN}_${DATE}.csv unset iops_disks bw mean_lat_disks_usec p99_lat_disks_usec p99_99_lat_disks_usec stdev_disks_usec echo "run-time,ramp-time,fio-plugin,QD,block-size,num-cpu-cores,workload,workload-mix" > $result_file printf "%s,%s,%s,%s,%s,%s,%s,%s\n" $RUNTIME $RAMP_TIME $PLUGIN $IODEPTH $BLK_SIZE $NO_CORES $RW $MIX >> $result_file @@ -123,7 +123,7 @@ do run_bdevperf > $NVME_FIO_RESULTS iops_disks[$k]=$((${iops_disks[$k]} + $(get_bdevperf_results iops))) bw[$k]=$((${bw[$k]} + $(get_bdevperf_results bw_Kibs))) - cp $NVME_FIO_RESULTS $BASE_DIR/results/$result_dir/perf_results_${MIX}_${PLUGIN}_${NO_CORES}cpus_${date}_${k}_disks_${j}.output + cp $NVME_FIO_RESULTS $BASE_DIR/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" @@ -132,12 +132,12 @@ do run_spdk_nvme_fio $PLUGIN "--runtime=$RUNTIME" "--ramp_time=$RAMP_TIME" "--bs=$BLK_SIZE"\ "--rw=$RW" "--rwmixread=$MIX" "--iodepth=$qd" "--output=$NVME_FIO_RESULTS" "--time_based=1"\ "--numjobs=$NUMJOBS" "--description=$desc" "-log_avg_msec=250"\ - "--write_lat_log=$BASE_DIR/results/$result_dir/perf_lat_${BLK_SIZE}BS_${IODEPTH}QD_${RW}_${MIX}MIX_${PLUGIN}_${date}_${k}disks_${j}" + "--write_lat_log=$BASE_DIR/results/$result_dir/perf_lat_${BLK_SIZE}BS_${IODEPTH}QD_${RW}_${MIX}MIX_${PLUGIN}_${DATE}_${k}disks_${j}" else run_nvme_fio $fio_ioengine_opt "--runtime=$RUNTIME" "--ramp_time=$RAMP_TIME" "--bs=$BLK_SIZE"\ "--rw=$RW" "--rwmixread=$MIX" "--iodepth=$qd" "--output=$NVME_FIO_RESULTS" "--time_based=1"\ "--numjobs=$NUMJOBS" "--description=$desc" "-log_avg_msec=250"\ - "--write_lat_log=$BASE_DIR/results/$result_dir/perf_lat_${BLK_SIZE}BS_${IODEPTH}QD_${RW}_${MIX}MIX_${PLUGIN}_${date}_${k}disks_${j}" + "--write_lat_log=$BASE_DIR/results/$result_dir/perf_lat_${BLK_SIZE}BS_${IODEPTH}QD_${RW}_${MIX}MIX_${PLUGIN}_${DATE}_${k}disks_${j}" fi #Store values for every number of used disks @@ -150,8 +150,8 @@ do mean_slat_disks_usec[$k]=$((${mean_slat_disks_usec[$k]} + $(get_results mean_slat_usec $MIX))) mean_clat_disks_usec[$k]=$((${mean_clat_disks_usec[$k]} + $(get_results mean_clat_usec $MIX))) bw[$k]=$((${bw[$k]} + $(get_results bw_Kibs $MIX))) - cp $NVME_FIO_RESULTS $BASE_DIR/results/$result_dir/perf_results_${MIX}_${PLUGIN}_${NO_CORES}cpus_${date}_${k}_disks_${j}.json - cp $BASE_DIR/config.fio $BASE_DIR/results/$result_dir/config_${MIX}_${PLUGIN}_${NO_CORES}cpus_${date}_${k}_disks_${j}.fio + cp $NVME_FIO_RESULTS $BASE_DIR/results/$result_dir/perf_results_${MIX}_${PLUGIN}_${NO_CORES}cpus_${DATE}_${k}_disks_${j}.json + cp $BASE_DIR/config.fio $BASE_DIR/results/$result_dir/config_${MIX}_${PLUGIN}_${NO_CORES}cpus_${DATE}_${k}_disks_${j}.fio rm -f $BASE_DIR/config.fio fi