Reduce async_destroy_001_pos memory requirements

The number of blocks which can be freed per TXG is controlled by the zfs_free_max_blocks module option (defaults to 100,000). Both speed up this test case and reduce the memory requirements by only creating 4 TXGs worth of blocks to be freed. Reviewed-by: George Melikov <[email protected]> Reviewed-by: Giuseppe Di Natale <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Issue openzfs#5479 Closes openzfs#6192
behlendorf · Jun 6, 2017 · ca8b210 · ca8b210
1 parent 6eb6073
commit ca8b210
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/tests/zfs-tests/tests/functional/features/async_destroy/async_destroy_001_pos.ksh b/tests/zfs-tests/tests/functional/features/async_destroy/async_destroy_001_pos.ksh
@@ -46,11 +46,6 @@ TEST_FS=$TESTPOOL/async_destroy
 
 verify_runnable "both"
 
-# See issue: https://github.com/zfsonlinux/zfs/issues/5479
-if is_kmemleak; then
-	log_unsupported "Test case runs slowly when kmemleak is enabled"
-fi
-
 function cleanup
 {
 	datasetexists $TEST_FS && log_must zfs destroy $TEST_FS
@@ -61,8 +56,11 @@ log_assert "async_destroy can suspend and resume traversal"
 
 log_must zfs create -o recordsize=512 -o compression=off $TEST_FS
 
-# Fill with 1G
-log_must dd bs=1024k count=1024 if=/dev/zero of=/$TEST_FS/file
+# Create enough blocks that it will take 4 TXGs to free them all.
+typeset zfs_free_max_blocks=100000
+typeset blocks=$((zfs_free_max_blocks * 4 * 512 / 1024 / 1024))
+
+log_must dd bs=1024k count=$blocks if=/dev/zero of=/$TEST_FS/file
 
 log_must zfs destroy $TEST_FS
 

diff --git a/tests/zfs-tests/tests/functional/features/async_destroy/setup.ksh b/tests/zfs-tests/tests/functional/features/async_destroy/setup.ksh
@@ -31,10 +31,6 @@
 
 . $STF_SUITE/include/libtest.shlib
 
-if is_32bit; then
-	log_unsupported "Test case fails on 32-bit systems"
-fi
-
 DISK=${DISKS%% *}
 
 default_setup $DISK