Assorted parameter changes for performance tests

[mirror_zfs.git] / tests / zfs-tests / tests / perf / regression / sequential_writes.ksh

diff --git a/tests/zfs-tests/tests/perf/regression/sequential_writes.ksh b/tests/zfs-tests/tests/perf/regression/sequential_writes.ksh
index 905723e5a180c67d14a7e668fe23ab0d8868743c..7850bc0375df4dc9c496786ecb1e09b8110a1058 100755 (executable)
--- a/tests/zfs-tests/tests/perf/regression/sequential_writes.ksh
+++ b/tests/zfs-tests/tests/perf/regression/sequential_writes.ksh
@@ -12,7 +12,7 @@
 #
 
 #
-# Copyright (c) 2015 by Delphix. All rights reserved.
+# Copyright (c) 2015, 2021 by Delphix. All rights reserved.
 #
 
 #
@@ -24,58 +24,65 @@
 # Prior to each fio run the dataset is recreated, and fio writes new files
 # into an otherwise empty pool.
 #
+# Thread/Concurrency settings:
+#    PERF_NTHREADS defines the number of files created in the test filesystem,
+#    as well as the number of threads that will simultaneously drive IO to
+#    those files.  The settings chosen are from measurements in the
+#    PerfAutoESX/ZFSPerfESX Environments, selected at concurrency levels that
+#    are at peak throughput but lowest latency.  Higher concurrency introduces
+#    queue time latency and would reduce the impact of code-induced performance
+#    regressions.
+#
 
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/perf/perf.shlib
 
-log_assert "Measure IO stats during sequential write load"
-log_onexit cleanup
-
 function cleanup
 {
        # kill fio and iostat
-       $PKILL ${FIO##*/}
-       $PKILL ${IOSTAT##*/}
-       log_must_busy $ZFS destroy $TESTFS
-       log_must_busy $ZPOOL destroy $PERFPOOL
+       pkill fio
+       pkill iostat
+       recreate_perf_pool
 }
 
 trap "log_fail \"Measure IO stats during random read load\"" SIGTERM
+log_onexit cleanup
 
-export TESTFS=$PERFPOOL/testfs
-recreate_perfpool
-log_must $ZFS create $PERF_FS_OPTS $TESTFS
+recreate_perf_pool
+populate_perf_filesystems
 
 # Aim to fill the pool to 50% capacity while accounting for a 3x compressratio.
-export TOTAL_SIZE=$(($(get_prop avail $TESTFS) * 3 / 2))
+export TOTAL_SIZE=$(($(get_prop avail $PERFPOOL) * 3 / 2))
 
-# Variables for use by fio.
-if [[ -n $PERF_REGRESSION_WEEKLY ]]; then
-       export PERF_RUNTIME=${PERF_RUNTIME:-$PERF_RUNTIME_WEEKLY}
-       export PERF_RUNTYPE=${PERF_RUNTYPE:-'weekly'}
-       export PERF_NTHREADS=${PERF_NTHREADS:-'8 16'}
-       export PERF_SYNC_TYPES=${PERF_SYNC_TYPES:-'0 1'}
-       export PERF_IOSIZES=${PERF_IOSIZES:-'8k 128k 1m'}
-elif [[ -n $PERF_REGRESSION_NIGHTLY ]]; then
-       export PERF_RUNTIME=${PERF_RUNTIME:-$PERF_RUNTIME_NIGHTLY}
-       export PERF_RUNTYPE=${PERF_RUNTYPE:-'nightly'}
-       export PERF_NTHREADS=${PERF_NTHREADS:-'64 128'}
-       export PERF_SYNC_TYPES=${PERF_SYNC_TYPES:-'1'}
-       export PERF_IOSIZES=${PERF_IOSIZES:-'8k 128k 1m'}
-fi
+# Variables specific to this test for use by fio.
+export PERF_NTHREADS=${PERF_NTHREADS:-'16 32'}
+export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'}
+export PERF_IOSIZES=${PERF_IOSIZES:-'8k 1m'}
+export PERF_SYNC_TYPES=${PERF_SYNC_TYPES:-'0 1'}
 
 # Set up the scripts and output files that will log performance data.
 lun_list=$(pool_to_lun_list $PERFPOOL)
 log_note "Collecting backend IO stats with lun list $lun_list"
 if is_linux; then
-       export collect_scripts=("$ZPOOL iostat -lpvyL $PERFPOOL 1" "zpool.iostat"
-           "$VMSTAT 1" "vmstat" "$MPSTAT -P ALL 1" "mpstat" "$IOSTAT -dxyz 1"
-           "iostat")
+       typeset perf_record_cmd="perf record -F 99 -a -g -q \
+           -o /dev/stdout -- sleep ${PERF_RUNTIME}"
+
+       export collect_scripts=(
+           "zpool iostat -lpvyL $PERFPOOL 1" "zpool.iostat"
+           "vmstat -t 1" "vmstat"
+           "mpstat -P ALL 1" "mpstat"
+           "iostat -tdxyz 1" "iostat"
+           "$perf_record_cmd" "perf"
+       )
 else
-       export collect_scripts=("$PERF_SCRIPTS/io.d $PERFPOOL $lun_list 1" "io"
-           "$VMSTAT 1" "vmstat" "$MPSTAT 1" "mpstat" "$IOSTAT -xcnz 1" "iostat")
+       export collect_scripts=(
+           "$PERF_SCRIPTS/io.d $PERFPOOL $lun_list 1" "io"
+           "vmstat -T d 1" "vmstat"
+           "mpstat -T d 1" "mpstat"
+           "iostat -T d -xcnz 1" "iostat"
+       )
 fi
 
-log_note "Sequential writes with $PERF_RUNTYPE settings"
-do_fio_run sequential_writes.fio $TRUE $FALSE
+log_note "Sequential writes with settings: $(print_perf_settings)"
+do_fio_run sequential_writes.fio true false
 log_pass "Measure IO stats during sequential write load"