Date: Tue, 12 Apr 2016 21:21:06 +0000 (UTC) From: Alan Somers <asomers@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r297876 - projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy Message-ID: <201604122121.u3CLL69A047270@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: asomers Date: Tue Apr 12 21:21:06 2016 New Revision: 297876 URL: https://svnweb.freebsd.org/changeset/base/297876 Log: Fix the zpool_destroy_004_pos.ksh test tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_004_pos.ksh * Fix a typo that prevented "zfs send" from running. This typo was present in the first revision of the file. * Reduce by a factor of about 2 the amount of data used in this test. It was excessive and let to long runtimes. Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_004_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_004_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_004_pos.ksh Tue Apr 12 21:17:19 2016 (r297875) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_004_pos.ksh Tue Apr 12 21:21:06 2016 (r297876) @@ -62,7 +62,7 @@ function send_recv_destroy recv=$2 to_destroy=$3 - ( $ZFS send -RP $TESTPOOL/$TESTFS@s0 | $ZFS receive -Fu $recv/d1 ) & + ( $ZFS send -RP $TESTPOOL/$TESTFS@snap1 | $ZFS receive -Fu $recv/d1 ) & sendrecvpid=$! log_must sleep $sleeptime @@ -108,10 +108,11 @@ for sleeptime in 0.1 0.3 0.5 0.75 1 2 3; done # A longer test that simulates a more realistic send|receive that exceeds -# the size of physical memory by 1/3 and gets interrupted a decent amount of +# the size of arc memory by 1/3 and gets interrupted a decent amount of # time after the start of the run. -physmem=$(sysctl -n hw.physmem) -datasz=$(expr ${physmem} / 1048576 \* 4 / 3) +arcmem=$(sysctl -n vfs.zfs.arc_max) +# ARC will use 2xdatasz memory since it caches both the src and dst copies +datasz=$(expr ${arcmem} / 1048576 \* 2 / 3) log_note "Running longer test with ${datasz}MB of data" sleeptime=15 run_tests
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604122121.u3CLL69A047270>