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 8ea4f841965cfa2a483061fd16f9d5a48fd42836..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, 2016 by Delphix. All rights reserved.
+# Copyright (c) 2015, 2021 by Delphix. All rights reserved.
 #
 
 #
@@ -54,22 +54,11 @@ populate_perf_filesystems
 # Aim to fill the pool to 50% capacity while accounting for a 3x compressratio.
 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:-'1 4 8 16 32 64 128'}
-       export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'}
-       export PERF_SYNC_TYPES=${PERF_SYNC_TYPES:-'0 1'}
-       export PERF_IOSIZES=${PERF_IOSIZES:-'8k 64k 256k'}
-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:-'16 32'}
-       export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'}
-       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)
@@ -94,6 +83,6 @@ else
        )
 fi
 
-log_note "Sequential writes with $PERF_RUNTYPE settings"
+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"