Date: Thu, 29 Dec 2011 19:01:29 +0000 (UTC) From: Peter Holm <pho@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r228968 - projects/stress2/misc Message-ID: <201112291901.pBTJ1TW8068717@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201112291901.pBTJ1TW8068717>