From owner-svn-src-user@FreeBSD.ORG Tue Feb 17 08:38:05 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1608C99A; Tue, 17 Feb 2015 08:38:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 01CADEB8; Tue, 17 Feb 2015 08:38:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1H8c42A076012; Tue, 17 Feb 2015 08:38:04 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1H8c3U7076006; Tue, 17 Feb 2015 08:38:03 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201502170838.t1H8c3U7076006@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Tue, 17 Feb 2015 08:38:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r278885 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Feb 2015 08:38:05 -0000 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