Date: Tue, 17 Feb 2015 08:38:03 +0000 (UTC) From: Peter Holm <pho@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r278885 - user/pho/stress2/misc Message-ID: <201502170838.t1H8c3U7076006@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pho Date: Tue Feb 17 08:38:02 2015 New Revision: 278885 URL: https://svnweb.freebsd.org/changeset/base/278885 Log: Do not run the zfs tests on small memory hosts. Fix trailing whitespace. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/zfs.sh user/pho/stress2/misc/zfs2.sh user/pho/stress2/misc/zfs3.sh user/pho/stress2/misc/zfs4.sh user/pho/stress2/misc/zfs5.sh Modified: user/pho/stress2/misc/zfs.sh ============================================================================== --- user/pho/stress2/misc/zfs.sh Tue Feb 17 08:28:43 2015 (r278884) +++ user/pho/stress2/misc/zfs.sh Tue Feb 17 08:38:02 2015 (r278885) @@ -31,6 +31,7 @@ # Simple zfs raidz test scenario [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 +[ $((`sysctl -n hw.usermem` / 1024 / 1024 / 1024)) -lt 3 ] && exit 0 . ../default.cfg @@ -53,7 +54,7 @@ zfs create tank/test export RUNDIR=/tank/test/stressX export runRUNTIME=20m -(cd ..; ./run.sh marcus.cfg) +(cd ..; ./run.sh marcus.cfg) zfs destroy -r tank zpool destroy tank Modified: user/pho/stress2/misc/zfs2.sh ============================================================================== --- user/pho/stress2/misc/zfs2.sh Tue Feb 17 08:28:43 2015 (r278884) +++ user/pho/stress2/misc/zfs2.sh Tue Feb 17 08:38:02 2015 (r278885) @@ -31,6 +31,7 @@ # Simple zfs mirror test scenario [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 +[ $((`sysctl -n hw.usermem` / 1024 / 1024 / 1024)) -lt 3 ] && exit 0 . ../default.cfg @@ -55,7 +56,7 @@ zpool create tank mirror md$u1 md$u2 export RUNDIR=/tank/stressX export runRUNTIME=10m -(cd ..; ./run.sh marcus.cfg) +(cd ..; ./run.sh marcus.cfg) zfs destroy -r tank zpool destroy tank Modified: user/pho/stress2/misc/zfs3.sh ============================================================================== --- user/pho/stress2/misc/zfs3.sh Tue Feb 17 08:28:43 2015 (r278884) +++ user/pho/stress2/misc/zfs3.sh Tue Feb 17 08:38:02 2015 (r278885) @@ -33,6 +33,7 @@ # page fault from fs/zfs/dbuf.c:1807 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 +[ $((`sysctl -n hw.usermem` / 1024 / 1024 / 1024)) -lt 3 ] && exit 0 . ../default.cfg @@ -60,7 +61,7 @@ zfs snapshot tank/test@snap1 export RUNDIR=/tank/test/stressX export runRUNTIME=10m -(cd ..; ./run.sh marcus.cfg) +(cd ..; ./run.sh marcus.cfg) zfs rollback tank/test@snap1 zfs destroy tank/test@snap1 Modified: user/pho/stress2/misc/zfs4.sh ============================================================================== --- user/pho/stress2/misc/zfs4.sh Tue Feb 17 08:28:43 2015 (r278884) +++ user/pho/stress2/misc/zfs4.sh Tue Feb 17 08:38:02 2015 (r278885) @@ -31,6 +31,7 @@ # Simple zfs snapshot test scenario [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 +[ $((`sysctl -n hw.usermem` / 1024 / 1024 / 1024)) -lt 3 ] && exit 0 . ../default.cfg Modified: user/pho/stress2/misc/zfs5.sh ============================================================================== --- user/pho/stress2/misc/zfs5.sh Tue Feb 17 08:28:43 2015 (r278884) +++ user/pho/stress2/misc/zfs5.sh Tue Feb 17 08:38:02 2015 (r278885) @@ -31,6 +31,7 @@ # Simple zfs test of vdev as a file and snapshot clones [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 +[ $((`sysctl -n hw.usermem` / 1024 / 1024 / 1024)) -lt 3 ] && exit 0 . ../default.cfg
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502170838.t1H8c3U7076006>