From owner-svn-src-projects@FreeBSD.ORG Thu Dec 29 19:01:30 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 58BB1106566B; Thu, 29 Dec 2011 19:01:30 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2DF118FC08; Thu, 29 Dec 2011 19:01:30 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBTJ1UPt068719; Thu, 29 Dec 2011 19:01:30 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBTJ1TW8068717; Thu, 29 Dec 2011 19:01:29 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <201112291901.pBTJ1TW8068717@svn.freebsd.org> From: Peter Holm Date: Thu, 29 Dec 2011 19:01:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r228968 - projects/stress2/misc X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Dec 2011 19:01:30 -0000 Author: pho Date: Thu Dec 29 19:01:29 2011 New Revision: 228968 URL: http://svn.freebsd.org/changeset/base/228968 Log: Clean up script and add SU+J tests. Modified: projects/stress2/misc/newfs.sh Modified: projects/stress2/misc/newfs.sh ============================================================================== --- projects/stress2/misc/newfs.sh Thu Dec 29 18:40:58 2011 (r228967) +++ projects/stress2/misc/newfs.sh Thu Dec 29 19:01:29 2011 (r228968) @@ -32,35 +32,28 @@ . ../default.cfg -size=1 # Gb -[ `df -k $(dirname $diskimage) | tail -1 | awk '{print $4'}` -lt $((size * 1024 * 1024)) ] && \ - echo "Not enough disk space." && exit 1 -truncate -s ${size}G $diskimage +mount | grep "$mntpoint" | grep md${mdstart}$part > /dev/null && umount $mntpoint +mdconfig -l | grep md$mdstart > /dev/null && mdconfig -d -u $mdstart -mount | grep "$mntpoint" | grep md${mdstart}${part} > /dev/null && umount $mntpoint -mdconfig -l | grep md${mdstart} > /dev/null && mdconfig -d -u ${mdstart} +mdconfig -a -t swap -s 1g -u $mdstart +bsdlabel -w md$mdstart auto -mdconfig -a -t vnode -f $diskimage -u ${mdstart} -bsdlabel -w md${mdstart} auto - - -for opt in "-O1" "-O2" "-O2 -U"; do +for opt in -O1 -O2 -U -j; do blocksize=4096 while [ $blocksize -le 65536 ]; do for i in 8 4 2 1; do fragsize=$((blocksize / i)) - echo "newfs $opt -b $blocksize -f $fragsize md${mdstart}${part}" - newfs $opt -b $blocksize -f $fragsize md${mdstart}${part} > /dev/null - mount /dev/md${mdstart}${part} $mntpoint + echo "`date '+%T'` newfs $opt -b $blocksize -f $fragsize md${mdstart}${part}" + newfs $opt -b $blocksize -f $fragsize md${mdstart}$part > /dev/null + mount /dev/md${mdstart}$part $mntpoint export RUNDIR=$mntpoint/stressX export runRUNTIME=4m - (cd ..; ./run.sh disk.cfg) - while mount | grep "$mntpoint" | grep -q md${mdstart}${part}; do - umount $mntpoint > /dev/null 2>&1 + (cd ..; ./run.sh disk.cfg > /dev/null 2>&1) + while mount | grep "$mntpoint" | grep -q md${mdstart}$part; do + umount $mntpoint > /dev/null 2>&1 || sleep 1 done done blocksize=$((blocksize * 2)) done done -mdconfig -d -u ${mdstart} -rm -f $diskimage +mdconfig -d -u $mdstart