Index: user/pho/stress2/misc/newfs.sh =================================================================== --- user/pho/stress2/misc/newfs.sh (revision 289180) +++ user/pho/stress2/misc/newfs.sh (revision 289181) @@ -1,59 +1,65 @@ #!/bin/sh # # Copyright (c) 2008-2011 Peter Holm # All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # # $FreeBSD$ # [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 . ../default.cfg -mount | grep "$mntpoint" | grep md${mdstart}$part > /dev/null && umount $mntpoint +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 +echo "Expect warnings from SU and SU+J." for opt in -O1 -O2 -U -j; do + echo "Testing newfs with option $opt." blocksize=4096 while [ $blocksize -le 65536 ]; do for i in 8 4 2 1; do fragsize=$((blocksize / i)) - echo "`date '+%T'` newfs $opt -b $blocksize -f $fragsize md${mdstart}${part}" - newfs $opt -b $blocksize -f $fragsize md${mdstart}$part > /dev/null + newfs $opt -b $blocksize -f $fragsize \ + md${mdstart}$part > /dev/null 2>&1 || continue mount /dev/md${mdstart}$part $mntpoint export RUNDIR=$mntpoint/stressX - export runRUNTIME=4m + export runRUNTIME=15s + export RUNTIME=$runRUNTIME + export CTRLDIR=$mntpoint/stressX.control (cd ..; ./run.sh disk.cfg > /dev/null 2>&1) - while mount | grep "$mntpoint" | grep -q md${mdstart}$part; do + 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 Index: user/pho/stress2/misc/newfs2.sh =================================================================== --- user/pho/stress2/misc/newfs2.sh (revision 289180) +++ user/pho/stress2/misc/newfs2.sh (revision 289181) @@ -1,59 +1,62 @@ #!/bin/sh # # Copyright (c) 2008-2011 Peter Holm # All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # # $FreeBSD$ # -# phk has seen freezes with this newfs option: "-b 32768 -f 4096 -O2" +# phk has seen freezes with this newfs option: "-b 32768 -f 4096 -O2" [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 . ../default.cfg size=$((32 * 1024 * 1024)) -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 -q md${mdstart}$part && umount $mntpoint +[ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart while [ $size -le $((900 * 1024 * 1024)) ]; do - echo "Testing with $((size / 1024 / 1024)) Mb" - truncate -s $size $diskimage - mdconfig -a -t vnode -f $diskimage -u ${mdstart} - disklabel -r -w md${mdstart} auto - newfs -b 32768 -f 4096 -O2 md${mdstart}${part} > /dev/null 2>&1 - mount /dev/md${mdstart}${part} $mntpoint - df -i $mntpoint + mb=$((size / 1024 / 1024)) + rm -f $diskimage + dd if=/dev/zero of=$diskimage bs=1m count=$mb 2>&1 | + egrep -v "records|transferred" + mdconfig -a -t vnode -f $diskimage -u $mdstart + bsdlabel -w md$mdstart auto + newfs -b 32768 -f 4096 -O2 md${mdstart}$part > /dev/null 2>&1 + mount /dev/md${mdstart}$part $mntpoint export RUNDIR=$mntpoint/stressX - export runRUNTIME=10m # Run tests for 10 minutes - (cd ..; ./run.sh disk.cfg) - while mount | grep "$mntpoint" | grep -q md${mdstart}${part}; do + export runRUNTIME=30s + export RUNTIME=$runRUNTIME + export CTRLDIR=$mntpoint/stressX.control + (cd ..; ./run.sh disk.cfg) > /dev/null + while mount | grep "$mntpoint" | grep -q md${mdstart}$part; do umount $mntpoint > /dev/null 2>&1 done - mdconfig -d -u ${mdstart} + mdconfig -d -u $mdstart size=$((size + 32 * 1024 * 1024)) done rm -f $diskimage Index: user/pho/stress2/misc/newfs3.sh =================================================================== --- user/pho/stress2/misc/newfs3.sh (revision 289180) +++ user/pho/stress2/misc/newfs3.sh (revision 289181) @@ -1,72 +1,78 @@ #!/bin/sh # # Copyright (c) 2008-2011 Peter Holm # All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # # $FreeBSD$ # # phk has seen freezes with this newfs option: "-b 32768 -f 4096 -O2" # # Deadlocks seen with this test and: # newfs -b 4096 -f 4096 -O2 md0c on a 128 Mb FS # newfs -b 4096 -f 1024 -O2 md0c on a 64 Mb FS # 20070505 newfs -b 4096 -f 4096 -O2 md0c on a 32 Mb FS: panic: lockmgr: locking against myself [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 . ../default.cfg size=$((32 * 1024 * 1024)) opt="-O2" # newfs option. Eg. -U -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 -q md${mdstart}$part && umount $mntpoint +[ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart while [ $size -le $((128 * 1024 * 1024)) ]; do - truncate -s $size $diskimage - mdconfig -a -t vnode -f $diskimage -u ${mdstart} - disklabel -r -w md${mdstart} auto + mb=$((size / 1024 / 1024)) + rm -f $diskimage + dd if=/dev/zero of=$diskimage bs=1m count=$mb 2>&1 | + egrep -v "records|transferred" + mdconfig -a -t vnode -f $diskimage -u $mdstart + bsdlabel -w md$mdstart auto blocksize=4096 while [ $blocksize -le 65536 ]; do for i in 1 2 4 8; do fragsize=$((blocksize / i)) - echo "newfs -b $blocksize -f $fragsize $opt md${mdstart}${part} on a $((size / 1024 / 1024)) Mb FS" - newfs -b $blocksize -f $fragsize $opt md${mdstart}${part} > /dev/null 2>&1 - mount /dev/md${mdstart}${part} $mntpoint + newfs -b $blocksize -f $fragsize $opt md${mdstart}$part > \ + /dev/null 2>&1 + mount /dev/md${mdstart}$part $mntpoint export RUNDIR=$mntpoint/stressX - export runRUNTIME=5m - (cd ..; ./run.sh disk.cfg) - while mount | grep "$mntpoint" | grep -q md${mdstart}${part}; do + export runRUNTIME=15s + export RUNTIME=$runRUNTIME + export CTRLDIR=$mntpoint/stressX.control + (cd ..; ./run.sh disk.cfg) > /dev/null + while mount | grep "$mntpoint" | \ + grep -q md${mdstart}$part; do umount $mntpoint > /dev/null 2>&1 done done blocksize=$((blocksize * 2)) done mdconfig -d -u ${mdstart} size=$((size + 32 * 1024 * 1024)) done rm -f $diskimage