From 6ae58ba6424e1f3472479af66d2bb4b2e0caf66e Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 17 Dec 2021 23:29:23 +0000 Subject: [PATCH] ZTS: speed up rsend tests With some minor tweaks several of rsend tests can be sped up considerably without significantly reducing test coverage. * send-c_verify_ratio: ~120s -> ~60s * send_realloc_*_files: ~330s -> ~65s For the send_realloc* tests this also has the advantage of removing (most of) the linux/freebsd conditional logic. Note that for this test more passes, and thus more incremental send/recvs, are preferable to a larger number of files. Total run time of the rsend test group was reduced from roughly 20 to 11 minutes in an environment similar to what's used by the CI. Reviewed-by: Tony Nguyen Reviewed-by: Ryan Moeller Signed-off-by: Brian Behlendorf Closes #12876 --- .../tests/functional/rsend/send-c_verify_ratio.ksh | 2 +- .../tests/functional/rsend/send_realloc_encrypted_files.ksh | 6 +----- .../zfs-tests/tests/functional/rsend/send_realloc_files.ksh | 6 +----- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/tests/zfs-tests/tests/functional/rsend/send-c_verify_ratio.ksh b/tests/zfs-tests/tests/functional/rsend/send-c_verify_ratio.ksh index b7d978624f2b..845349a95873 100755 --- a/tests/zfs-tests/tests/functional/rsend/send-c_verify_ratio.ksh +++ b/tests/zfs-tests/tests/functional/rsend/send-c_verify_ratio.ksh @@ -36,7 +36,7 @@ log_assert "Verify send -c streams are compressed" log_onexit cleanup_pool $POOL2 typeset sendfs=$POOL2/$FS -typeset megs=128 +typeset megs=64 for prop in "${compress_prop_vals[@]}"; do for compressible in 'yes' 'no'; do diff --git a/tests/zfs-tests/tests/functional/rsend/send_realloc_encrypted_files.ksh b/tests/zfs-tests/tests/functional/rsend/send_realloc_encrypted_files.ksh index a653f8b3f15e..361f6b375ea1 100755 --- a/tests/zfs-tests/tests/functional/rsend/send_realloc_encrypted_files.ksh +++ b/tests/zfs-tests/tests/functional/rsend/send_realloc_encrypted_files.ksh @@ -72,12 +72,8 @@ if is_kmemleak; then # to avoid timeout due to reduced performance. nr_files=100 passes=2 -elif is_freebsd; then - # Use fewer files and passes on FreeBSD to avoid timeout. - nr_files=500 - passes=2 else - nr_files=1000 + nr_files=300 passes=3 fi diff --git a/tests/zfs-tests/tests/functional/rsend/send_realloc_files.ksh b/tests/zfs-tests/tests/functional/rsend/send_realloc_files.ksh index 083a2bec9daa..187a899a23c6 100755 --- a/tests/zfs-tests/tests/functional/rsend/send_realloc_files.ksh +++ b/tests/zfs-tests/tests/functional/rsend/send_realloc_files.ksh @@ -64,12 +64,8 @@ if is_kmemleak; then # to avoid timeout due to reduced performance. nr_files=100 passes=2 -elif is_freebsd; then - # Use fewer passes and files on FreeBSD to avoid timeout. - nr_files=500 - passes=2 else - nr_files=1000 + nr_files=300 passes=3 fi