Assorted fixes for the performance tests

- Bail out early if we're running the perf tests and forget to
  specify disks.
- Allow perf tests to run with any number of disks.
- Remove weekly vs. nightly settings
- Move variables with common values to perf.shlib
- Use zinject to clear the ARC over export/import
- Fix dbuf cache size calculation

When the meaning of `dbuf_cache_max_bytes` changed, the performance
test that covers the dbuf cache started to fail. The test would try to
write files for the test using the max possible size of the cache,
inevitably filling the pool and failing. This change uses
`dbuf_cache_shift` to correctly calculate the dbuf cache size.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Tony Nguyen <tony.nguyen@delphix.com>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Signed-off-by: John Kennedy <john.kennedy@delphix.com>
Closes #12408

diff --git a/scripts/zfs-tests.sh b/scripts/zfs-tests.sh
index edb9c9f106c2368df01c3ddb07d353bf99489674..ac28788582f93d94d8437906c2ff2813d62c3e5b 100755 (executable)
--- a/scripts/zfs-tests.sh
+++ b/scripts/zfs-tests.sh
@@ -567,18 +567,17 @@ fi
 
 . "$STF_SUITE/include/default.cfg"
 
-msg
-msg "--- Configuration ---"
-msg "Runfiles:        $RUNFILES"
-msg "STF_TOOLS:       $STF_TOOLS"
-msg "STF_SUITE:       $STF_SUITE"
-msg "STF_PATH:        $STF_PATH"
-
 #
 # No DISKS have been provided so a basic file or loopback based devices
 # must be created for the test suite to use.
 #
 if [ -z "${DISKS}" ]; then
+       #
+       # If this is a performance run, prevent accidental use of
+       # loopback devices.
+       #
+       [ "$TAGS" = "perf" ] && fail "Running perf tests without disks."
+
        #
        # Create sparse files for the test suite.  These may be used
        # directory or have loopback devices layered on them.
@@ -619,8 +618,14 @@ if [ -z "${DISKS}" ]; then
        fi
 fi
 
+#
+# It may be desirable to test with fewer disks than the default when running
+# the performance tests, but the functional tests require at least three.
+#
 NUM_DISKS=$(echo "${DISKS}" | awk '{print NF}')
-[ "$NUM_DISKS" -lt 3 ] && fail "Not enough disks ($NUM_DISKS/3 minimum)"
+if [ "$TAGS" != "perf" ]; then
+       [ "$NUM_DISKS" -lt 3 ] && fail "Not enough disks ($NUM_DISKS/3 minimum)"
+fi
 
 #
 # Disable SELinux until the ZFS Test Suite has been updated accordingly.
@@ -637,6 +642,12 @@ if [ -e /sys/module/zfs/parameters/zfs_dbgmsg_enable ]; then
        sudo /bin/sh -c "echo 0 >/proc/spl/kstat/zfs/dbgmsg"
 fi
 
+msg
+msg "--- Configuration ---"
+msg "Runfiles:        $RUNFILES"
+msg "STF_TOOLS:       $STF_TOOLS"
+msg "STF_SUITE:       $STF_SUITE"
+msg "STF_PATH:        $STF_PATH"
 msg "FILEDIR:         $FILEDIR"
 msg "FILES:           $FILES"
 msg "LOOPBACKS:       $LOOPBACKS"

diff --git a/tests/zfs-tests/include/tunables.cfg b/tests/zfs-tests/include/tunables.cfg
index a1b75a48292f53a5a5c669e6647fba334240e20d..56d430a39875acea9ef97c3d61c445dffa771c64 100644 (file)
--- a/tests/zfs-tests/include/tunables.cfg
+++ b/tests/zfs-tests/include/tunables.cfg
@@ -27,7 +27,7 @@ COMPRESSED_ARC_ENABLED                compressed_arc_enabled          zfs_compressed_arc_enabled
 CONDENSE_INDIRECT_COMMIT_ENTRY_DELAY_MS        condense.indirect_commit_entry_delay_ms zfs_condense_indirect_commit_entry_delay_ms
 CONDENSE_INDIRECT_OBSOLETE_PCT condense.indirect_obsolete_pct  zfs_condense_indirect_obsolete_pct
 CONDENSE_MIN_MAPPING_BYTES     condense.min_mapping_bytes      zfs_condense_min_mapping_bytes
-DBUF_CACHE_MAX_BYTES           dbuf_cache.max_bytes            dbuf_cache_max_bytes
+DBUF_CACHE_SHIFT               dbuf.cache_shift                dbuf_cache_shift
 DEADMAN_CHECKTIME_MS           deadman.checktime_ms            zfs_deadman_checktime_ms
 DEADMAN_FAILMODE               deadman.failmode                zfs_deadman_failmode
 DEADMAN_SYNCTIME_MS            deadman.synctime_ms             zfs_deadman_synctime_ms

diff --git a/tests/zfs-tests/tests/perf/perf.shlib b/tests/zfs-tests/tests/perf/perf.shlib
index 6addd46610c2ff93d80e6e6eed42e62463a000d2..6f4fdc94348f4d82fad9c73e13584e4a0e80d1c1 100644 (file)
--- a/tests/zfs-tests/tests/perf/perf.shlib
+++ b/tests/zfs-tests/tests/perf/perf.shlib
@@ -10,18 +10,18 @@
 #
 
 #
-# Copyright (c) 2015, 2016 by Delphix. All rights reserved.
+# Copyright (c) 2015, 2021 by Delphix. All rights reserved.
 # Copyright (c) 2016, Intel Corporation.
 #
 
 . $STF_SUITE/include/libtest.shlib
 
-# If neither is specified, do a nightly run.
-[[ -z $PERF_REGRESSION_WEEKLY ]] && export PERF_REGRESSION_NIGHTLY=1
-
-# Default runtime for each type of test run.
-export PERF_RUNTIME_WEEKLY=$((30 * 60))
-export PERF_RUNTIME_NIGHTLY=$((10 * 60))
+# Defaults common to all the tests in the regression group
+export PERF_RUNTIME=${PERF_RUNTIME:-'180'}
+export PERF_RANDSEED=${PERF_RANDSEED:-'1234'}
+export PERF_COMPPERCENT=${PERF_COMPPERCENT:-'66'}
+export PERF_COMPCHUNK=${PERF_COMPCHUNK:-'4096'}
+export PERF_SYNC_TYPES=${PERF_SYNC_TYPES:-'1'}
 
 # Default to JSON for fio output
 export PERF_FIO_FORMAT=${PERF_FIO_FORMAT:-'json'}
@@ -90,8 +90,7 @@ function do_fio_run_impl
 
        if $clear_cache; then
                # Clear the ARC
-               zpool export $PERFPOOL
-               zpool import $PERFPOOL
+               log_must zinject -a
        fi
 
        if [[ -n $ZINJECT_DELAYS ]]; then
@@ -159,8 +158,6 @@ function do_fio_run_impl
 # set before launching zfstest to override the defaults.
 #
 # PERF_RUNTIME: The time in seconds each fio invocation should run.
-# PERF_RUNTYPE: A human readable tag that appears in logs. The defaults are
-#    nightly and weekly.
 # PERF_NTHREADS: A list of how many threads each fio invocation will use.
 # PERF_SYNC_TYPES: Whether to use (O_SYNC) or not. 1 is sync IO, 0 is async IO.
 # PERF_IOSIZES: A list of blocksizes in which each fio invocation will do IO.
@@ -424,22 +421,44 @@ function get_max_arc_size
        echo $max_arc_size
 }
 
-function get_max_dbuf_cache_size
+function get_arc_target
 {
-       typeset -l max_dbuf_cache_size
+       typeset -l arc_c
+
+       if is_freebsd; then
+               arc_c=$(sysctl -n kstat.zfs.misc.arcstats.c)
+       elif is_illumos; then
+               arc_c=$(dtrace -qn 'BEGIN {
+                   printf("%u\n", `arc_stats.arcstat_c.value.ui64);
+                   exit(0);
+               }')
+       elif is_linux; then
+               arc_c=`awk '$1 == "c" { print $3 }' \
+                   /proc/spl/kstat/zfs/arcstats`
+       fi
+
+       [[ $? -eq 0 ]] || log_fail "get_arc_target failed"
+
+       echo $arc_c
+}
+
+function get_dbuf_cache_size
+{
+       typeset -l dbuf_cache_size dbuf_cache_shift
 
        if is_illumos; then
-               max_dbuf_cache_size=$(dtrace -qn 'BEGIN {
+               dbuf_cache_size=$(dtrace -qn 'BEGIN {
                    printf("%u\n", `dbuf_cache_max_bytes);
                    exit(0);
                }')
        else
-               max_dbuf_cache_size=$(get_tunable DBUF_CACHE_MAX_BYTES)
+               dbuf_cache_shift=$(get_tunable DBUF_CACHE_SHIFT)
+               dbuf_cache_size=$(($(get_arc_target) / 2**dbuf_cache_shift))
        fi
 
-       [[ $? -eq 0 ]] || log_fail "get_max_dbuf_cache_size failed"
+       [[ $? -eq 0 ]] || log_fail "get_dbuf_cache_size failed"
 
-       echo $max_dbuf_cache_size
+       echo $dbuf_cache_size
 }
 
 # Create a file with some information about how this system is configured.
@@ -569,6 +588,14 @@ function pool_to_lun_list
        echo $lun_list
 }
 
+function print_perf_settings
+{
+       echo "PERF_NTHREADS: $PERF_NTHREADS"
+       echo "PERF_NTHREADS_PER_FS: $PERF_NTHREADS_PER_FS"
+       echo "PERF_SYNC_TYPES: $PERF_SYNC_TYPES"
+       echo "PERF_IOSIZES: $PERF_IOSIZES"
+}
+
 # Create a perf_data directory to hold performance statistics and
 # configuration information.
 export PERF_DATA_DIR=$(get_perf_output_dir)

diff --git a/tests/zfs-tests/tests/perf/regression/random_reads.ksh b/tests/zfs-tests/tests/perf/regression/random_reads.ksh
index e6d207e22747851d89388c1d293e9fd52db0c10c..5c8066d17549e3cac021c24e9813f90f89d2cdfe 100755 (executable)
--- a/tests/zfs-tests/tests/perf/regression/random_reads.ksh
+++ b/tests/zfs-tests/tests/perf/regression/random_reads.ksh
@@ -12,7 +12,7 @@
 #
 
 #
-# Copyright (c) 2015, 2020 by Delphix. All rights reserved.
+# Copyright (c) 2015, 2021 by Delphix. All rights reserved.
 #
 
 #
@@ -55,28 +55,10 @@ 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_RANDSEED=${PERF_RANDSEED:-'1234'}
-       export PERF_COMPPERCENT=${PERF_COMPPERCENT:-'66'}
-       export PERF_COMPCHUNK=${PERF_COMPCHUNK:-'4096'}
-       export PERF_RUNTYPE=${PERF_RUNTYPE:-'weekly'}
-       export PERF_NTHREADS=${PERF_NTHREADS:-'8 16 32 64'}
-       export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'}
-       export PERF_SYNC_TYPES=${PERF_SYNC_TYPES:-'1'}
-       export PERF_IOSIZES=${PERF_IOSIZES:-'8k 64k 128k'}
-elif [[ -n $PERF_REGRESSION_NIGHTLY ]]; then
-       export PERF_RUNTIME=${PERF_RUNTIME:-$PERF_RUNTIME_NIGHTLY}
-       export PERF_RANDSEED=${PERF_RANDSEED:-'1234'}
-       export PERF_COMPPERCENT=${PERF_COMPPERCENT:-'66'}
-       export PERF_COMPCHUNK=${PERF_COMPCHUNK:-'4096'}
-       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'}
-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'}
 
 # Layout the files to be used by the read tests. Create as many files as the
 # largest number of threads. An fio run with fewer threads will use a subset
@@ -109,6 +91,6 @@ else
        )
 fi
 
-log_note "Random reads with $PERF_RUNTYPE settings"
+log_note "Random reads with settings: $(print_perf_settings)"
 do_fio_run random_reads.fio false true
 log_pass "Measure IO stats during random read load"

diff --git a/tests/zfs-tests/tests/perf/regression/random_readwrite.ksh b/tests/zfs-tests/tests/perf/regression/random_readwrite.ksh
index 573e9c7d4c5827f1a82903a2cf10fb6d1630b4a1..33d7d8c8d9452563f50bda21d2b869f39d38615a 100755 (executable)
--- a/tests/zfs-tests/tests/perf/regression/random_readwrite.ksh
+++ b/tests/zfs-tests/tests/perf/regression/random_readwrite.ksh
@@ -12,7 +12,7 @@
 #
 
 #
-# Copyright (c) 2015, 2020 by Delphix. All rights reserved.
+# Copyright (c) 2015, 2021 by Delphix. All rights reserved.
 #
 
 #
@@ -55,28 +55,10 @@ 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_RANDSEED=${PERF_RANDSEED:-'1234'}
-       export PERF_COMPPERCENT=${PERF_COMPPERCENT:-'66'}
-       export PERF_COMPCHUNK=${PERF_COMPCHUNK:-'4096'}
-       export PERF_RUNTYPE=${PERF_RUNTYPE:-'weekly'}
-       export PERF_NTHREADS=${PERF_NTHREADS:-'4 8 16 64'}
-       export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'}
-       export PERF_SYNC_TYPES=${PERF_SYNC_TYPES:-'0 1'}
-       export PERF_IOSIZES=''          # bssplit used instead
-elif [[ -n $PERF_REGRESSION_NIGHTLY ]]; then
-       export PERF_RUNTIME=${PERF_RUNTIME:-$PERF_RUNTIME_NIGHTLY}
-       export PERF_RANDSEED=${PERF_RANDSEED:-'1234'}
-       export PERF_COMPPERCENT=${PERF_COMPPERCENT:-'66'}
-       export PERF_COMPCHUNK=${PERF_COMPCHUNK:-'4096'}
-       export PERF_RUNTYPE=${PERF_RUNTYPE:-'nightly'}
-       export PERF_NTHREADS=${PERF_NTHREADS:-'32 64'}
-       export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'}
-       export PERF_SYNC_TYPES=${PERF_SYNC_TYPES:-'1'}
-       export PERF_IOSIZES=''          # bssplit used instead
-fi
+# Variables specific to this test for use by fio.
+export PERF_NTHREADS=${PERF_NTHREADS:-'32 64'}
+export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'}
+export PERF_IOSIZES=''         # bssplit used instead
 
 # Layout the files to be used by the readwrite tests. Create as many files
 # as the largest number of threads. An fio run with fewer threads will use
@@ -109,6 +91,6 @@ else
        )
 fi
 
-log_note "Random reads and writes with $PERF_RUNTYPE settings"
+log_note "Random reads and writes with settings: $(print_perf_settings)"
 do_fio_run random_readwrite.fio false true
 log_pass "Measure IO stats during random read and write load"

diff --git a/tests/zfs-tests/tests/perf/regression/random_readwrite_fixed.ksh b/tests/zfs-tests/tests/perf/regression/random_readwrite_fixed.ksh
index 78af5213a3d38bab7c9b9ebff7072f419dad4a42..bb4014563f1f35c079cac9c1c1bd122369e77e39 100755 (executable)
--- a/tests/zfs-tests/tests/perf/regression/random_readwrite_fixed.ksh
+++ b/tests/zfs-tests/tests/perf/regression/random_readwrite_fixed.ksh
@@ -11,7 +11,7 @@
 #
 
 #
-# Copyright (c) 2017, 2020 by Delphix. All rights reserved.
+# Copyright (c) 2017, 2021 by Delphix. All rights reserved.
 #
 
 #
@@ -45,28 +45,10 @@ 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_RANDSEED=${PERF_RANDSEED:-'1234'}
-       export PERF_COMPPERCENT=${PERF_COMPPERCENT:-'66'}
-       export PERF_COMPCHUNK=${PERF_COMPCHUNK:-'4096'}
-       export PERF_RUNTYPE=${PERF_RUNTYPE:-'weekly'}
-       export PERF_NTHREADS=${PERF_NTHREADS:-'8 16 32 64'}
-       export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'}
-       export PERF_SYNC_TYPES=${PERF_SYNC_TYPES:-'0 1'}
-       export PERF_IOSIZES='8k 64k'
-elif [[ -n $PERF_REGRESSION_NIGHTLY ]]; then
-       export PERF_RUNTIME=${PERF_RUNTIME:-$PERF_RUNTIME_NIGHTLY}
-       export PERF_RANDSEED=${PERF_RANDSEED:-'1234'}
-       export PERF_COMPPERCENT=${PERF_COMPPERCENT:-'66'}
-       export PERF_COMPCHUNK=${PERF_COMPCHUNK:-'4096'}
-       export PERF_RUNTYPE=${PERF_RUNTYPE:-'nightly'}
-       export PERF_NTHREADS=${PERF_NTHREADS:-'64 128'}
-       export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'}
-       export PERF_SYNC_TYPES=${PERF_SYNC_TYPES:-'1'}
-       export PERF_IOSIZES='8k'
-fi
+# Variables specific to this test for use by fio.
+export PERF_NTHREADS=${PERF_NTHREADS:-'64 128'}
+export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'}
+export PERF_IOSIZES=${PERF_IOSIZES:-'8k'}
 
 # Layout the files to be used by the readwrite tests. Create as many files
 # as the largest number of threads. An fio run with fewer threads will use
@@ -101,6 +83,6 @@ else
        )
 fi
 
-log_note "Random reads and writes with $PERF_RUNTYPE settings"
+log_note "Random reads and writes with settings: $(print_perf_settings)"
 do_fio_run random_readwrite_fixed.fio false true
 log_pass "Measure IO stats during random read and write load"

diff --git a/tests/zfs-tests/tests/perf/regression/random_writes.ksh b/tests/zfs-tests/tests/perf/regression/random_writes.ksh
index dca013cbae0c3a4be92640a612481a945e23e10b..4b826835efbf814363b67723ab2bf745053c1f48 100755 (executable)
--- a/tests/zfs-tests/tests/perf/regression/random_writes.ksh
+++ b/tests/zfs-tests/tests/perf/regression/random_writes.ksh
@@ -12,7 +12,7 @@
 #
 
 #
-# Copyright (c) 2015, 2020 by Delphix. All rights reserved.
+# Copyright (c) 2015, 2021 by Delphix. All rights reserved.
 #
 
 #
@@ -54,28 +54,10 @@ 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_RANDSEED=${PERF_RANDSEED:-'1234'}
-       export PERF_COMPPERCENT=${PERF_COMPPERCENT:-'66'}
-       export PERF_COMPCHUNK=${PERF_COMPCHUNK:-'4096'}
-       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_RANDSEED=${PERF_RANDSEED:-'1234'}
-       export PERF_COMPPERCENT=${PERF_COMPPERCENT:-'66'}
-       export PERF_COMPCHUNK=${PERF_COMPCHUNK:-'4096'}
-       export PERF_RUNTYPE=${PERF_RUNTYPE:-'nightly'}
-       export PERF_NTHREADS=${PERF_NTHREADS:-'32 128'}
-       export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'}
-       export PERF_SYNC_TYPES=${PERF_SYNC_TYPES:-'1'}
-       export PERF_IOSIZES=${PERF_IOSIZES:-'8k'}
-fi
+# Variables specific to this test for use by fio.
+export PERF_NTHREADS=${PERF_NTHREADS:-'32 128'}
+export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'}
+export PERF_IOSIZES=${PERF_IOSIZES:-'8k'}
 
 # Set up the scripts and output files that will log performance data.
 lun_list=$(pool_to_lun_list $PERFPOOL)
@@ -100,6 +82,6 @@ else
        )
 fi
 
-log_note "Random writes with $PERF_RUNTYPE settings"
+log_note "Random writes with settings: $(print_perf_settings)"
 do_fio_run random_writes.fio true false
 log_pass "Measure IO stats during random write load"

diff --git a/tests/zfs-tests/tests/perf/regression/random_writes_zil.ksh b/tests/zfs-tests/tests/perf/regression/random_writes_zil.ksh
index 5d4fd77a74582b2397fdc53ebabac2ea0cdad12c..522ee45268281a2ab58320c2c53fa0034c5e3f2a 100755 (executable)
--- a/tests/zfs-tests/tests/perf/regression/random_writes_zil.ksh
+++ b/tests/zfs-tests/tests/perf/regression/random_writes_zil.ksh
@@ -12,7 +12,7 @@
 #
 
 #
-# Copyright (c) 2015, 2020 by Delphix. All rights reserved.
+# Copyright (c) 2015, 2021 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -43,28 +43,10 @@ recreate_perf_pool
 # Aim to fill the pool to 50% capacity while accounting for a 3x compressratio.
 export TOTAL_SIZE=$(($(get_prop avail $PERFPOOL) * 3 / 2))
 
-if [[ -n $PERF_REGRESSION_WEEKLY ]]; then
-       export PERF_RUNTIME=${PERF_RUNTIME:-$PERF_RUNTIME_WEEKLY}
-       export PERF_RANDSEED=${PERF_RANDSEED:-'1234'}
-       export PERF_COMPPERCENT=${PERF_COMPPERCENT:-'66'}
-       export PERF_COMPCHUNK=${PERF_COMPCHUNK:-'4096'}
-       export PERF_RUNTYPE=${PERF_RUNTYPE:-'weekly'}
-       export PERF_NTHREADS=${PERF_NTHREADS:-'1 2 4 8 16 32 64 128'}
-       export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0 1'}
-       export PERF_SYNC_TYPES=${PERF_SYNC_TYPES:-'1'}
-       export PERF_IOSIZES=${PERF_IOSIZES:-'8k'}
-
-elif [[ -n $PERF_REGRESSION_NIGHTLY ]]; then
-       export PERF_RUNTIME=${PERF_RUNTIME:-$PERF_RUNTIME_NIGHTLY}
-       export PERF_RANDSEED=${PERF_RANDSEED:-'1234'}
-       export PERF_COMPPERCENT=${PERF_COMPPERCENT:-'66'}
-       export PERF_COMPCHUNK=${PERF_COMPCHUNK:-'4096'}
-       export PERF_RUNTYPE=${PERF_RUNTYPE:-'nightly'}
-       export PERF_NTHREADS=${PERF_NTHREADS:-'1 4 16 64'}
-       export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0 1'}
-       export PERF_SYNC_TYPES=${PERF_SYNC_TYPES:-'1'}
-       export PERF_IOSIZES=${PERF_IOSIZES:-'8k'}
-fi
+# Variables specific to this test for use by fio.
+export PERF_NTHREADS=${PERF_NTHREADS:-'1 4 16 64'}
+export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0 1'}
+export PERF_IOSIZES=${PERF_IOSIZES:-'8k'}
 
 # Until the performance tests over NFS can deal with multiple file systems,
 # force the use of only one file system when testing over NFS.
@@ -95,6 +77,7 @@ else
            "dtrace  -s $PERF_SCRIPTS/offcpu-profile.d" "offcpu-profile"
        )
 fi
-log_note "ZIL specific random write workload with $PERF_RUNTYPE settings"
+log_note \
+    "ZIL specific random write workload with settings: $(print_perf_settings)"
 do_fio_run random_writes.fio true false
 log_pass "Measure IO stats during ZIL specific random write workload"

diff --git a/tests/zfs-tests/tests/perf/regression/sequential_reads.ksh b/tests/zfs-tests/tests/perf/regression/sequential_reads.ksh
index e5cf6278391cd8298d196ef7cb88fc0d53d939e6..2bdfff736f4e310541e2bd1b40f02e8f80b2191d 100755 (executable)
--- a/tests/zfs-tests/tests/perf/regression/sequential_reads.ksh
+++ b/tests/zfs-tests/tests/perf/regression/sequential_reads.ksh
@@ -12,7 +12,7 @@
 #
 
 #
-# Copyright (c) 2015, 2020 by Delphix. All rights reserved.
+# Copyright (c) 2015, 2021 by Delphix. All rights reserved.
 #
 
 #
@@ -55,28 +55,10 @@ 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_RANDSEED=${PERF_RANDSEED:-'1234'}
-       export PERF_COMPPERCENT=${PERF_COMPPERCENT:-'66'}
-       export PERF_COMPCHUNK=${PERF_COMPCHUNK:-'4096'}
-       export PERF_RUNTYPE=${PERF_RUNTYPE:-'weekly'}
-       export PERF_NTHREADS=${PERF_NTHREADS:-'8 16 32 64'}
-       export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'}
-       export PERF_SYNC_TYPES=${PERF_SYNC_TYPES:-'1'}
-       export PERF_IOSIZES=${PERF_IOSIZES:-'8k 64k 128k'}
-elif [[ -n $PERF_REGRESSION_NIGHTLY ]]; then
-       export PERF_RUNTIME=${PERF_RUNTIME:-$PERF_RUNTIME_NIGHTLY}
-       export PERF_RANDSEED=${PERF_RANDSEED:-'1234'}
-       export PERF_COMPPERCENT=${PERF_COMPPERCENT:-'66'}
-       export PERF_COMPCHUNK=${PERF_COMPCHUNK:-'4096'}
-       export PERF_RUNTYPE=${PERF_RUNTYPE:-'nightly'}
-       export PERF_NTHREADS=${PERF_NTHREADS:-'8 16'}
-       export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'}
-       export PERF_SYNC_TYPES=${PERF_SYNC_TYPES:-'1'}
-       export PERF_IOSIZES=${PERF_IOSIZES:-'128k 1m'}
-fi
+# Variables specific to this test for use by fio.
+export PERF_NTHREADS=${PERF_NTHREADS:-'8 16'}
+export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'}
+export PERF_IOSIZES=${PERF_IOSIZES:-'128k 1m'}
 
 # Layout the files to be used by the read tests. Create as many files as the
 # largest number of threads. An fio run with fewer threads will use a subset
@@ -111,6 +93,6 @@ else
        )
 fi
 
-log_note "Sequential reads with $PERF_RUNTYPE settings"
+log_note "Sequential reads with settings: $(print_perf_settings)"
 do_fio_run sequential_reads.fio false true
 log_pass "Measure IO stats during sequential read load"

diff --git a/tests/zfs-tests/tests/perf/regression/sequential_reads_arc_cached.ksh b/tests/zfs-tests/tests/perf/regression/sequential_reads_arc_cached.ksh
index d44e37f3eaafa355964bf72d10f919b84c6a940f..8127786361bafcb8284c45433226228cb2e7ee5e 100755 (executable)
--- a/tests/zfs-tests/tests/perf/regression/sequential_reads_arc_cached.ksh
+++ b/tests/zfs-tests/tests/perf/regression/sequential_reads_arc_cached.ksh
@@ -12,7 +12,7 @@
 #
 
 #
-# Copyright (c) 2015, 2020 by Delphix. All rights reserved.
+# Copyright (c) 2015, 2021 by Delphix. All rights reserved.
 #
 
 #
@@ -45,28 +45,10 @@ populate_perf_filesystems
 # Make sure the working set can be cached in the arc. Aim for 1/2 of arc.
 export TOTAL_SIZE=$(($(get_max_arc_size) / 2))
 
-# Variables for use by fio.
-if [[ -n $PERF_REGRESSION_WEEKLY ]]; then
-       export PERF_RUNTIME=${PERF_RUNTIME:-$PERF_RUNTIME_WEEKLY}
-       export PERF_RANDSEED=${PERF_RANDSEED:-'1234'}
-       export PERF_COMPPERCENT=${PERF_COMPPERCENT:-'66'}
-       export PERF_COMPCHUNK=${PERF_COMPCHUNK:-'4096'}
-       export PERF_RUNTYPE=${PERF_RUNTYPE:-'weekly'}
-       export PERF_NTHREADS=${PERF_NTHREADS:-'8 16 32 64'}
-       export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'}
-       export PERF_SYNC_TYPES=${PERF_SYNC_TYPES:-'1'}
-       export PERF_IOSIZES=${PERF_IOSIZES:-'8k 64k 128k'}
-elif [[ -n $PERF_REGRESSION_NIGHTLY ]]; then
-       export PERF_RUNTIME=${PERF_RUNTIME:-$PERF_RUNTIME_NIGHTLY}
-       export PERF_RANDSEED=${PERF_RANDSEED:-'1234'}
-       export PERF_COMPPERCENT=${PERF_COMPPERCENT:-'66'}
-       export PERF_COMPCHUNK=${PERF_COMPCHUNK:-'4096'}
-       export PERF_RUNTYPE=${PERF_RUNTYPE:-'nightly'}
-       export PERF_NTHREADS=${PERF_NTHREADS:-'64 128'}
-       export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'}
-       export PERF_SYNC_TYPES=${PERF_SYNC_TYPES:-'1'}
-       export PERF_IOSIZES=${PERF_IOSIZES:-'128k 1m'}
-fi
+# Variables specific to this test for use by fio.
+export PERF_NTHREADS=${PERF_NTHREADS:-'64 128'}
+export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'}
+export PERF_IOSIZES=${PERF_IOSIZES:-'128k 1m'}
 
 # Layout the files to be used by the read tests. Create as many files as the
 # largest number of threads. An fio run with fewer threads will use a subset
@@ -101,6 +83,6 @@ else
        )
 fi
 
-log_note "Sequential cached reads with $PERF_RUNTYPE settings"
+log_note "Sequential cached reads with settings: $(print_perf_settings)"
 do_fio_run sequential_reads.fio false false
 log_pass "Measure IO stats during sequential cached read load"

diff --git a/tests/zfs-tests/tests/perf/regression/sequential_reads_arc_cached_clone.ksh b/tests/zfs-tests/tests/perf/regression/sequential_reads_arc_cached_clone.ksh
index 1b3ee85ec55a6aa8ae1be0b44ccd8eb285af285d..8ce1273c2869afe7e7b28470726ee934f84aa3a4 100755 (executable)
--- a/tests/zfs-tests/tests/perf/regression/sequential_reads_arc_cached_clone.ksh
+++ b/tests/zfs-tests/tests/perf/regression/sequential_reads_arc_cached_clone.ksh
@@ -12,7 +12,7 @@
 #
 
 #
-# Copyright (c) 2015, 2020 by Delphix. All rights reserved.
+# Copyright (c) 2015, 2021 by Delphix. All rights reserved.
 #
 
 #
@@ -51,28 +51,10 @@ populate_perf_filesystems
 # Make sure the working set can be cached in the arc. Aim for 1/2 of arc.
 export TOTAL_SIZE=$(($(get_max_arc_size) / 2))
 
-# Variables for use by fio.
-if [[ -n $PERF_REGRESSION_WEEKLY ]]; then
-       export PERF_RUNTIME=${PERF_RUNTIME:-$PERF_RUNTIME_WEEKLY}
-       export PERF_RANDSEED=${PERF_RANDSEED:-'1234'}
-       export PERF_COMPPERCENT=${PERF_COMPPERCENT:-'66'}
-       export PERF_COMPCHUNK=${PERF_COMPCHUNK:-'4096'}
-       export PERF_RUNTYPE=${PERF_RUNTYPE:-'weekly'}
-       export PERF_NTHREADS=${PERF_NTHREADS:-'8 16 32 64'}
-       export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'}
-       export PERF_SYNC_TYPES=${PERF_SYNC_TYPES:-'1'}
-       export PERF_IOSIZES=${PERF_IOSIZES:-'8k 64k 128k'}
-elif [[ -n $PERF_REGRESSION_NIGHTLY ]]; then
-       export PERF_RUNTIME=${PERF_RUNTIME:-$PERF_RUNTIME_NIGHTLY}
-       export PERF_RANDSEED=${PERF_RANDSEED:-'1234'}
-       export PERF_COMPPERCENT=${PERF_COMPPERCENT:-'66'}
-       export PERF_COMPCHUNK=${PERF_COMPCHUNK:-'4096'}
-       export PERF_RUNTYPE=${PERF_RUNTYPE:-'nightly'}
-       export PERF_NTHREADS=${PERF_NTHREADS:-'64 128'}
-       export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'}
-       export PERF_SYNC_TYPES=${PERF_SYNC_TYPES:-'1'}
-       export PERF_IOSIZES=${PERF_IOSIZES:-'128k 1m'}
-fi
+# Variables specific to this test for use by fio.
+export PERF_NTHREADS=${PERF_NTHREADS:-'64 128'}
+export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'}
+export PERF_IOSIZES=${PERF_IOSIZES:-'128k 1m'}
 
 # Layout the files to be used by the read tests. Create as many files as the
 # largest number of threads. An fio run with fewer threads will use a subset
@@ -127,6 +109,7 @@ else
        )
 fi
 
-log_note "Sequential cached reads from $DIRECTORY with $PERF_RUNTYPE settings"
+log_note "Sequential cached reads from $DIRECTORY with " \
+    "ettings: $(print_perf_settings)"
 do_fio_run sequential_reads.fio false false
 log_pass "Measure IO stats during sequential cached read load"

diff --git a/tests/zfs-tests/tests/perf/regression/sequential_reads_dbuf_cached.ksh b/tests/zfs-tests/tests/perf/regression/sequential_reads_dbuf_cached.ksh
index 888136fec93cdd5962b6453aa48363d76722d67f..adacdc29799cdd198e82cae892828da5a40f4ca9 100755 (executable)
--- a/tests/zfs-tests/tests/perf/regression/sequential_reads_dbuf_cached.ksh
+++ b/tests/zfs-tests/tests/perf/regression/sequential_reads_dbuf_cached.ksh
@@ -12,7 +12,7 @@
 #
 
 #
-# Copyright (c) 2016, 2020 by Delphix. All rights reserved.
+# Copyright (c) 2016, 2021 by Delphix. All rights reserved.
 #
 
 #
@@ -47,30 +47,12 @@ recreate_perf_pool
 populate_perf_filesystems
 
 # Ensure the working set can be cached in the dbuf cache.
-export TOTAL_SIZE=$(($(get_max_dbuf_cache_size) * 3 / 4))
+export TOTAL_SIZE=$(($(get_dbuf_cache_size) * 3 / 4))
 
-# Variables for use by fio.
-if [[ -n $PERF_REGRESSION_WEEKLY ]]; then
-       export PERF_RUNTIME=${PERF_RUNTIME:-$PERF_RUNTIME_WEEKLY}
-       export PERF_RANDSEED=${PERF_RANDSEED:-'1234'}
-       export PERF_COMPPERCENT=${PERF_COMPPERCENT:-'66'}
-       export PERF_COMPCHUNK=${PERF_COMPCHUNK:-'4096'}
-       export PERF_RUNTYPE=${PERF_RUNTYPE:-'weekly'}
-       export PERF_NTHREADS=${PERF_NTHREADS:-'8 16 32 64'}
-       export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'}
-       export PERF_SYNC_TYPES=${PERF_SYNC_TYPES:-'1'}
-       export PERF_IOSIZES=${PERF_IOSIZES:-'8k 64k 128k'}
-elif [[ -n $PERF_REGRESSION_NIGHTLY ]]; then
-       export PERF_RUNTIME=${PERF_RUNTIME:-$PERF_RUNTIME_NIGHTLY}
-       export PERF_RANDSEED=${PERF_RANDSEED:-'1234'}
-       export PERF_COMPPERCENT=${PERF_COMPPERCENT:-'66'}
-       export PERF_COMPCHUNK=${PERF_COMPCHUNK:-'4096'}
-       export PERF_RUNTYPE=${PERF_RUNTYPE:-'nightly'}
-       export PERF_NTHREADS=${PERF_NTHREADS:-'64'}
-       export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'}
-       export PERF_SYNC_TYPES=${PERF_SYNC_TYPES:-'1'}
-       export PERF_IOSIZES=${PERF_IOSIZES:-'64k'}
-fi
+# Variables specific to this test for use by fio.
+export PERF_NTHREADS=${PERF_NTHREADS:-'64'}
+export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'}
+export PERF_IOSIZES=${PERF_IOSIZES:-'64k'}
 
 # Layout the files to be used by the read tests. Create as many files as the
 # largest number of threads. An fio run with fewer threads will use a subset
@@ -107,6 +89,6 @@ else
        )
 fi
 
-log_note "Sequential cached reads with $PERF_RUNTYPE settings"
+log_note "Sequential cached reads with settings: $(print_perf_settings)"
 do_fio_run sequential_reads.fio false false
 log_pass "Measure IO stats during sequential cached read load"

diff --git a/tests/zfs-tests/tests/perf/regression/sequential_writes.ksh b/tests/zfs-tests/tests/perf/regression/sequential_writes.ksh
index b4f466c4f65c031b8ec5aa0bedd4fcad71c56b3c..d32690a0542e1decc2d3bd3a133709fe6191a437 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, 2020 by Delphix. All rights reserved.
+# Copyright (c) 2015, 2021 by Delphix. All rights reserved.
 #
 
 #
@@ -54,28 +54,10 @@ 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_RANDSEED=${PERF_RANDSEED:-'1234'}
-       export PERF_COMPPERCENT=${PERF_COMPPERCENT:-'66'}
-       export PERF_COMPCHUNK=${PERF_COMPCHUNK:-'4096'}
-       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_RANDSEED=${PERF_RANDSEED:-'1234'}
-       export PERF_COMPPERCENT=${PERF_COMPPERCENT:-'66'}
-       export PERF_COMPCHUNK=${PERF_COMPCHUNK:-'4096'}
-       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 128k 1m'}
 
 # Set up the scripts and output files that will log performance data.
 lun_list=$(pool_to_lun_list $PERFPOOL)
@@ -100,6 +82,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"

diff --git a/tests/zfs-tests/tests/perf/regression/setup.ksh b/tests/zfs-tests/tests/perf/regression/setup.ksh
index 1544f637d8d9390db893b613c0fc53a308f061bf..68be00d4a63c8ebc4272bc1e35461153349afe88 100755 (executable)
--- a/tests/zfs-tests/tests/perf/regression/setup.ksh
+++ b/tests/zfs-tests/tests/perf/regression/setup.ksh
@@ -12,12 +12,11 @@
 #
 
 #
-# Copyright (c) 2015 by Delphix. All rights reserved.
+# Copyright (c) 2015, 2021 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
 
 verify_runnable "global"
-verify_disk_count "$DISKS" 3
 
 log_pass