Date: Mon, 1 May 2017 07:44:34 +0000 (UTC) From: Peter Holm <pho@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r317638 - user/pho/stress2/misc Message-ID: <201705010744.v417iY0b029875@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pho Date: Mon May 1 07:44:34 2017 New Revision: 317638 URL: https://svnweb.freebsd.org/changeset/base/317638 Log: Style. Only use braces for shell variables when needed. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/alternativeFlushPath.sh user/pho/stress2/misc/backingstore.sh user/pho/stress2/misc/backingstore2.sh user/pho/stress2/misc/backingstore3.sh user/pho/stress2/misc/core4.sh user/pho/stress2/misc/core5.sh user/pho/stress2/misc/crossmp3.sh user/pho/stress2/misc/crossmp4.sh user/pho/stress2/misc/crossmp5.sh user/pho/stress2/misc/crossmp8.sh user/pho/stress2/misc/crossmp9.sh user/pho/stress2/misc/dfull.sh user/pho/stress2/misc/ext2fs2.sh user/pho/stress2/misc/extattr.sh user/pho/stress2/misc/extattr_set_fd.sh user/pho/stress2/misc/fdgrowtable.sh user/pho/stress2/misc/fragments.sh user/pho/stress2/misc/fs.sh user/pho/stress2/misc/ftruncate2.sh user/pho/stress2/misc/fuse.sh user/pho/stress2/misc/fuzz.sh user/pho/stress2/misc/linger2.sh user/pho/stress2/misc/linger3.sh user/pho/stress2/misc/linger4.sh user/pho/stress2/misc/md.sh user/pho/stress2/misc/md3.sh user/pho/stress2/misc/mmap4.sh user/pho/stress2/misc/mount2.sh user/pho/stress2/misc/mountro.sh user/pho/stress2/misc/mountro2.sh user/pho/stress2/misc/mountro3.sh user/pho/stress2/misc/msdos.sh user/pho/stress2/misc/msdos2.sh user/pho/stress2/misc/msdos3.sh user/pho/stress2/misc/msdos6.sh user/pho/stress2/misc/msdos7.sh user/pho/stress2/misc/newfs3.sh user/pho/stress2/misc/nfs2.sh user/pho/stress2/misc/nullfs11.sh user/pho/stress2/misc/pfl.sh user/pho/stress2/misc/quota1.sh user/pho/stress2/misc/quota10.sh user/pho/stress2/misc/quota2.sh user/pho/stress2/misc/quota3.sh user/pho/stress2/misc/quota4.sh user/pho/stress2/misc/quota7.sh user/pho/stress2/misc/quota8.sh user/pho/stress2/misc/quota9.sh user/pho/stress2/misc/rename11.sh user/pho/stress2/misc/rename3.sh user/pho/stress2/misc/rename5.sh user/pho/stress2/misc/rename6.sh user/pho/stress2/misc/rename7.sh user/pho/stress2/misc/rename8.sh user/pho/stress2/misc/rename9.sh user/pho/stress2/misc/snap2.sh user/pho/stress2/misc/snap8.sh user/pho/stress2/misc/softupdate.sh user/pho/stress2/misc/suj10.sh user/pho/stress2/misc/suj18.sh user/pho/stress2/misc/suj19.sh user/pho/stress2/misc/suj20.sh user/pho/stress2/misc/suj21.sh user/pho/stress2/misc/suj22.sh user/pho/stress2/misc/suj24.sh user/pho/stress2/misc/suj30.sh user/pho/stress2/misc/suj32.sh user/pho/stress2/misc/suj34.sh user/pho/stress2/misc/symlink.sh user/pho/stress2/misc/symlink2.sh user/pho/stress2/misc/tmpfs4.sh user/pho/stress2/misc/tmpfs8.sh user/pho/stress2/misc/tmpfs9.sh user/pho/stress2/misc/truncate3.sh user/pho/stress2/misc/truncate5.sh user/pho/stress2/misc/umount.sh user/pho/stress2/misc/umountf.sh user/pho/stress2/misc/umountf2.sh user/pho/stress2/misc/umountf4.sh user/pho/stress2/misc/umountf5.sh user/pho/stress2/misc/union.sh user/pho/stress2/misc/vunref2.sh 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/zfs6.sh Modified: user/pho/stress2/misc/alternativeFlushPath.sh ============================================================================== --- user/pho/stress2/misc/alternativeFlushPath.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/alternativeFlushPath.sh Mon May 1 07:44:34 2017 (r317638) @@ -41,7 +41,7 @@ . ../default.cfg odir=`pwd` -dir=${RUNDIR}/alternativeFlushPath +dir=$RUNDIR/alternativeFlushPath [ -d $dir ] && find $dir -type f | xargs rm rm -rf $dir @@ -58,6 +58,7 @@ done wait sysctl vfs.altbufferflushes +cd $odir rm -rf /tmp/alternativeFlushPath $dir exit Modified: user/pho/stress2/misc/backingstore.sh ============================================================================== --- user/pho/stress2/misc/backingstore.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/backingstore.sh Mon May 1 07:44:34 2017 (r317638) @@ -39,7 +39,7 @@ export here=`pwd` m=$mdstart -mount | grep "${mntpoint}" | grep -q md$m && umount ${mntpoint}$m +mount | grep "$mntpoint" | grep -q md$m && umount ${mntpoint}$m mdconfig -l | grep -q md$m && mdconfig -d -u $m dede $D$m 100m 1 || exit 1 @@ -47,23 +47,23 @@ dede $D$m 100m 1 || exit 1 mdconfig -a -t vnode -f $D$m -u $m bsdlabel -w md$m auto -newfs md${m}${part} > /dev/null 2>&1 +newfs md${m}$part > /dev/null 2>&1 [ -d ${mntpoint}$m ] || mkdir -p ${mntpoint}$m -mount $opt /dev/md${m}${part} ${mntpoint}$m +mount $opt /dev/md${m}$part ${mntpoint}$m n=$m m=$((m + 1)) -mount | grep "${mntpoint}" | grep -q md$m && umount ${mntpoint}$m +mount | grep "$mntpoint" | grep -q md$m && umount ${mntpoint}$m mdconfig -l | grep -q md$m && mdconfig -d -u $m truncate -s 500M ${mntpoint}$n/diskimage mdconfig -a -t vnode -f ${mntpoint}$n/diskimage -u $m bsdlabel -w md$m auto -newfs md${m}${part} > /dev/null 2>&1 +newfs md${m}$part > /dev/null 2>&1 [ -d ${mntpoint}$m ] || mkdir -p ${mntpoint}$m -mount $opt /dev/md${m}${part} ${mntpoint}$m +mount $opt /dev/md${m}$part ${mntpoint}$m export RUNDIR=${mntpoint}$m/stressX ../testcases/rw/rw -t 5m -i 200 -h -n Modified: user/pho/stress2/misc/backingstore2.sh ============================================================================== --- user/pho/stress2/misc/backingstore2.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/backingstore2.sh Mon May 1 07:44:34 2017 (r317638) @@ -42,9 +42,9 @@ export here=`pwd` m1=$mdstart m2=$((m1 + 1)) -mount | grep "${mntpoint}" | grep -q md$m2 && umount ${mntpoint}$m2 +mount | grep "$mntpoint" | grep -q md$m2 && umount ${mntpoint}$m2 mdconfig -l | grep -q md$m2 && mdconfig -d -u $m2 -mount | grep "${mntpoint}" | grep -q md$m1 && umount ${mntpoint}$m1 +mount | grep "$mntpoint" | grep -q md$m1 && umount ${mntpoint}$m1 mdconfig -l | grep -q md$m1 && mdconfig -d -u $m1 [ -d ${mntpoint}$m1 ] || mkdir -p ${mntpoint}$m1 [ -d ${mntpoint}$m2 ] || mkdir -p ${mntpoint}$m2 @@ -54,22 +54,22 @@ dede $D$m1 100m 1 || exit 1 mdconfig -a -t vnode -f $D$m1 -u $m1 bsdlabel -w md$m1 auto -newfs md${m1}${part} > /dev/null 2>&1 -mount /dev/md${m1}${part} ${mntpoint}$m1 +newfs md${m1}$part > /dev/null 2>&1 +mount /dev/md${m1}$part ${mntpoint}$m1 truncate -s 500M ${mntpoint}$m1/diskimage mdconfig -a -t vnode -f ${mntpoint}$m1/diskimage -u $m2 bsdlabel -w md$m2 auto -newfs md${m2}${part} > /dev/null 2>&1 -mount /dev/md${m2}${part} ${mntpoint}$m2 +newfs md${m2}$part > /dev/null 2>&1 +mount /dev/md${m2}$part ${mntpoint}$m2 # Reversed umount sequence: -umount -f /dev/md${m1}${part} -umount -f /dev/md${m2}${part} +umount -f /dev/md${m1}$part +umount -f /dev/md${m2}$part -mount | grep "${mntpoint}" | grep -q md$m2 && umount ${mntpoint}$m2 +mount | grep "$mntpoint" | grep -q md$m2 && umount ${mntpoint}$m2 mdconfig -l | grep -q md$m2 && mdconfig -d -u $m2 -mount | grep "${mntpoint}" | grep -q md$m1 && umount ${mntpoint}$m1 +mount | grep "$mntpoint" | grep -q md$m1 && umount ${mntpoint}$m1 mdconfig -l | grep -q md$m1 && mdconfig -d -u $m1 Modified: user/pho/stress2/misc/backingstore3.sh ============================================================================== --- user/pho/stress2/misc/backingstore3.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/backingstore3.sh Mon May 1 07:44:34 2017 (r317638) @@ -41,9 +41,9 @@ export here=`pwd` m1=$mdstart m2=$((m1 + 1)) -mount | grep "${mntpoint}" | grep -q md$m2 && umount ${mntpoint}$m2 +mount | grep "$mntpoint" | grep -q md$m2 && umount ${mntpoint}$m2 mdconfig -l | grep -q md$m2 && mdconfig -d -u $m2 -mount | grep "${mntpoint}" | grep -q md$m1 && umount ${mntpoint}$m1 +mount | grep "$mntpoint" | grep -q md$m1 && umount ${mntpoint}$m1 mdconfig -l | grep -q md$m1 && mdconfig -d -u $m1 [ -d ${mntpoint}$m1 ] || mkdir -p ${mntpoint}$m1 [ -d ${mntpoint}$m2 ] || mkdir -p ${mntpoint}$m2 @@ -53,24 +53,24 @@ dede $D$m1 25m 1 || exit 1 mdconfig -a -t vnode -f $D$m1 -u $m1 bsdlabel -w md$m1 auto -newfs md${m1}${part} > /dev/null 2>&1 -mount /dev/md${m1}${part} ${mntpoint}$m1 +newfs md${m1}$part > /dev/null 2>&1 +mount /dev/md${m1}$part ${mntpoint}$m1 truncate -s 500M ${mntpoint}$m1/diskimage mdconfig -a -t vnode -f ${mntpoint}$m1/diskimage -u $m2 bsdlabel -w md$m2 auto -newfs md${m2}${part} > /dev/null 2>&1 -mount /dev/md${m2}${part} ${mntpoint}$m2 +newfs md${m2}$part > /dev/null 2>&1 +mount /dev/md${m2}$part ${mntpoint}$m2 dd if=/dev/zero of=${mntpoint}$m2/file bs=1m > /dev/null 2>&1 # Reversed umount sequence: -umount -f /dev/md${m1}${part} -umount -f /dev/md${m2}${part} +umount -f /dev/md${m1}$part +umount -f /dev/md${m2}$part -mount | grep "${mntpoint}" | grep -q md$m2 && umount ${mntpoint}$m2 +mount | grep "$mntpoint" | grep -q md$m2 && umount ${mntpoint}$m2 mdconfig -l | grep -q md$m2 && mdconfig -d -u $m2 -mount | grep "${mntpoint}" | grep -q md$m1 && umount ${mntpoint}$m1 +mount | grep "$mntpoint" | grep -q md$m1 && umount ${mntpoint}$m1 mdconfig -l | grep -q md$m1 && mdconfig -d -u $m1 Modified: user/pho/stress2/misc/core4.sh ============================================================================== --- user/pho/stress2/misc/core4.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/core4.sh Mon May 1 07:44:34 2017 (r317638) @@ -53,7 +53,7 @@ mount | grep -q "$mntpoint" && umount $m mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 2g -u $mdstart -bsdlabel -w md${mdstart} auto +bsdlabel -w md$mdstart auto newfs $newfs_flags md${mdstart}$part > /dev/null for i in `jot 20`; do Modified: user/pho/stress2/misc/core5.sh ============================================================================== --- user/pho/stress2/misc/core5.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/core5.sh Mon May 1 07:44:34 2017 (r317638) @@ -94,7 +94,7 @@ mount | grep -q "on $mntpoint " && umoun [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t malloc -s 1g -u $mdstart -bsdlabel -w md${mdstart} auto +bsdlabel -w md$mdstart auto newfs -b 4096 -f 512 -i 2048 md${mdstart}$part > /dev/null mount -o async /dev/md${mdstart}$part $mntpoint || exit 1 Modified: user/pho/stress2/misc/crossmp3.sh ============================================================================== --- user/pho/stress2/misc/crossmp3.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/crossmp3.sh Mon May 1 07:44:34 2017 (r317638) @@ -86,7 +86,7 @@ else # The test: Parallel mount and unmounts for i in `jot 3`; do m=$1 - mount /dev/md${m}${part} ${mntpoint}$m && + mount /dev/md${m}$part ${mntpoint}$m && chmod 777 ${mntpoint}$m export RUNDIR=${mntpoint}$m/stressX export CTRLDIR=${mntpoint}$m/stressX.control Modified: user/pho/stress2/misc/crossmp4.sh ============================================================================== --- user/pho/stress2/misc/crossmp4.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/crossmp4.sh Mon May 1 07:44:34 2017 (r317638) @@ -49,7 +49,7 @@ size=$((usermem / 1024 / 1024)) mounts=$N # Number of parallel scripts if [ $# -eq 0 ]; then - mount | grep "$mntpoint" | grep -q md && umount ${mntpoint} + mount | grep "$mntpoint" | grep -q md && umount $mntpoint mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s ${size}m -u $mdstart Modified: user/pho/stress2/misc/crossmp5.sh ============================================================================== --- user/pho/stress2/misc/crossmp5.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/crossmp5.sh Mon May 1 07:44:34 2017 (r317638) @@ -79,7 +79,7 @@ else # The test: Parallel mount and unmount m=$1 for i in `jot 200`; do - mount /dev/md${m}${part} ${mntpoint}$m + mount /dev/md${m}$part ${mntpoint}$m chmod 777 ${mntpoint}$m l=`jot -r 1 65535` dd if=/dev/zero of=$mntpoint/$i bs=$l count=100 \ Modified: user/pho/stress2/misc/crossmp8.sh ============================================================================== --- user/pho/stress2/misc/crossmp8.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/crossmp8.sh Mon May 1 07:44:34 2017 (r317638) @@ -97,7 +97,7 @@ else start=`date '+%s'` while [ $((`date '+%s'` - start)) -lt 300 ]; do m=$1 - mount /dev/md${m}${part} ${mntpoint}$m && + mount /dev/md${m}$part ${mntpoint}$m && chmod 777 ${mntpoint}$m export RUNDIR=${mntpoint}$m/stressX export CTRLDIR=${mntpoint}$m/stressX.control Modified: user/pho/stress2/misc/crossmp9.sh ============================================================================== --- user/pho/stress2/misc/crossmp9.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/crossmp9.sh Mon May 1 07:44:34 2017 (r317638) @@ -80,7 +80,7 @@ else start=`date '+%s'` while [ $((`date '+%s'` - start)) -lt 300 ] ; do m=$1 - mount /dev/md${m}${part} ${mntpoint}$m + mount /dev/md${m}$part ${mntpoint}$m while mount | grep -qw ${mntpoint}$m; do opt=$([ $((`date '+%s'` % 2)) -eq 0 ] && echo "-f") umount $opt ${mntpoint}$m > /dev/null 2>&1 Modified: user/pho/stress2/misc/dfull.sh ============================================================================== --- user/pho/stress2/misc/dfull.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/dfull.sh Mon May 1 07:44:34 2017 (r317638) @@ -43,7 +43,7 @@ bsdlabel -w md$mdstart auto newfs $newfs_flags md${mdstart}$part > /dev/null mount /dev/md${mdstart}$part $mntpoint -export RUNDIR=${mntpoint}/stressX +export RUNDIR=$mntpoint/stressX set `df -ik $mntpoint | tail -1 | awk '{print $4,$7}'` export KBLOCKS=$(($1 * 10)) export INODES=$(($2 * 10)) Modified: user/pho/stress2/misc/ext2fs2.sh ============================================================================== --- user/pho/stress2/misc/ext2fs2.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/ext2fs2.sh Mon May 1 07:44:34 2017 (r317638) @@ -37,11 +37,11 @@ # Uses mke2fs from sysutils/e2fsprogs [ -x /usr/local/sbin/mke2fs ] || exit 0 -mount | grep "$mntpoint" | grep -q md$mdstart && umount -f ${mntpoint} -mdconfig -l | grep -q ${mdstart} && mdconfig -d -u $mdstart +mount | grep "$mntpoint" | grep -q md$mdstart && umount -f $mntpoint +mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 1g -u $mdstart -bsdlabel -w md${mdstart} auto +bsdlabel -w md$mdstart auto mke2fs /dev/md${mdstart}a # No panic seen when disabling hashed b-tree lookup for large directories # tune2fs -O ^dir_index /dev/md${mdstart}$part Modified: user/pho/stress2/misc/extattr.sh ============================================================================== --- user/pho/stress2/misc/extattr.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/extattr.sh Mon May 1 07:44:34 2017 (r317638) @@ -43,25 +43,25 @@ mycc -o extattr -Wall extattr.c rm -f extattr.c cd $odir -mount | grep "${mntpoint}" | grep -q md${mdstart}${part} && umount $mntpoint +mount | grep "$mntpoint" | grep -q md${mdstart}$part && umount $mntpoint mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 20m -u $mdstart bsdlabel -w md$mdstart auto -newfs -O 2 md${mdstart}${part} > /dev/null -mount /dev/md${mdstart}${part} $mntpoint +newfs -O 2 md${mdstart}$part > /dev/null +mount /dev/md${mdstart}$part $mntpoint -mkdir -p ${mntpoint}/.attribute/system -cd ${mntpoint}/.attribute/system +mkdir -p $mntpoint/.attribute/system +cd $mntpoint/.attribute/system extattrctl initattr -p . 388 posix1e.acl_access extattrctl initattr -p . 388 posix1e.acl_default cd / umount /mnt -tunefs -a enable /dev/md${mdstart}${part} -mount /dev/md${mdstart}${part} $mntpoint -mount | grep md${mdstart}${part} +tunefs -a enable /dev/md${mdstart}$part +mount /dev/md${mdstart}$part $mntpoint +mount | grep md${mdstart}$part touch $mntpoint/acl-test setfacl -b $mntpoint/acl-test Modified: user/pho/stress2/misc/extattr_set_fd.sh ============================================================================== --- user/pho/stress2/misc/extattr_set_fd.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/extattr_set_fd.sh Mon May 1 07:44:34 2017 (r317638) @@ -44,9 +44,9 @@ rm -f extattr_set_fd.c mount | grep -q "$mntpoint" && umount $mntpoint mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 1g -u $mdstart -bsdlabel -w md${mdstart} auto -newfs $newfs_flags md${mdstart}${part} > /dev/null -mount /dev/md${mdstart}${part} $mntpoint +bsdlabel -w md$mdstart auto +newfs $newfs_flags md${mdstart}$part > /dev/null +mount /dev/md${mdstart}$part $mntpoint chmod 777 $mntpoint (cd $mntpoint; /tmp/extattr_set_fd) Modified: user/pho/stress2/misc/fdgrowtable.sh ============================================================================== --- user/pho/stress2/misc/fdgrowtable.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/fdgrowtable.sh Mon May 1 07:44:34 2017 (r317638) @@ -43,7 +43,7 @@ mycc -o fdgrowtable -Wall -Wextra -O2 fd rm -f fdgrowtable.c cd $here -su ${testuser} -c "/tmp/fdgrowtable $max" & +su $testuser -c "/tmp/fdgrowtable $max" & while kill -0 $! 2>/dev/null; do ../testcases/swap/swap -t 2m -i 40 -h done Modified: user/pho/stress2/misc/fragments.sh ============================================================================== --- user/pho/stress2/misc/fragments.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/fragments.sh Mon May 1 07:44:34 2017 (r317638) @@ -47,7 +47,7 @@ mycc -o fragments -Wall -Wextra -O2 -g f rm -f fragments.c cd $here -mount | grep "$mntpoint" | grep -q md$mdstart && umount -f ${mntpoint} +mount | grep "$mntpoint" | grep -q md$mdstart && umount -f $mntpoint mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 1g -u $mdstart Modified: user/pho/stress2/misc/fs.sh ============================================================================== --- user/pho/stress2/misc/fs.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/fs.sh Mon May 1 07:44:34 2017 (r317638) @@ -41,7 +41,7 @@ ftest () { # option, disk full mount /dev/md${mdstart}$part $mntpoint chmod 777 $mntpoint - export RUNDIR=${mntpoint}/stressX + export RUNDIR=$mntpoint/stressX export runRUNTIME=2m disk=$(($2 + 1)) # 1 or 2 set `df -ik $mntpoint | tail -1 | awk '{print $4,$7}'` @@ -59,11 +59,11 @@ ftest () { # option, disk full } -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 20m -u ${mdstart} -bsdlabel -w md${mdstart} auto +mdconfig -a -t swap -s 20m -u $mdstart +bsdlabel -w md$mdstart auto ftest "-O 1" 0 # ufs1 ftest "-O 1" 1 # ufs1, disk full @@ -74,4 +74,4 @@ ftest "-U" 1 # ufs2 + soft update, di ftest "-j" 0 # ufs2 + SU+J ftest "-j" 1 # ufs2 + SU+J, disk full -mdconfig -d -u ${mdstart} +mdconfig -d -u $mdstart Modified: user/pho/stress2/misc/ftruncate2.sh ============================================================================== --- user/pho/stress2/misc/ftruncate2.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/ftruncate2.sh Mon May 1 07:44:34 2017 (r317638) @@ -28,7 +28,7 @@ # $FreeBSD$ # -# A fuzz test. Most likely a disk full / FFS issue. +# A fuzz test triggered a failed block allocation unwinding problem. # "panic: ffs_blkfree_cg: freeing free block" seen: # https://people.freebsd.org/~pho/stress/log/kostik923.txt @@ -49,7 +49,7 @@ echo "Expect: \"/mnt: write failed, file mount | grep $mntpoint | grep -q "on $mntpoint " && umount -f $mntpoint mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 1g -u $mdstart || exit 1 -bsdlabel -w md${mdstart} auto +bsdlabel -w md$mdstart auto newfs md${mdstart}$part > /dev/null # Non SU panics mount /dev/md${mdstart}$part $mntpoint Modified: user/pho/stress2/misc/fuse.sh ============================================================================== --- user/pho/stress2/misc/fuse.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/fuse.sh Mon May 1 07:44:34 2017 (r317638) @@ -43,9 +43,9 @@ mount | grep -q "$mntpoint" && umount $m mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 1g -u $mdstart -mkntfs -Ff /dev/md${mdstart} > /dev/null 2>&1 || exit 1 +mkntfs -Ff /dev/md$mdstart > /dev/null 2>&1 || exit 1 -$MOUNT /dev/md${mdstart} $mntpoint || exit 1 +$MOUNT /dev/md$mdstart $mntpoint || exit 1 export RUNDIR=$mntpoint/stressX export runRUNTIME=20m Modified: user/pho/stress2/misc/fuzz.sh ============================================================================== --- user/pho/stress2/misc/fuzz.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/fuzz.sh Mon May 1 07:44:34 2017 (r317638) @@ -84,7 +84,7 @@ tst() { break fi done - mdconfig -d -u ${mdstart} + mdconfig -d -u $mdstart rm -f $D } Modified: user/pho/stress2/misc/linger2.sh ============================================================================== --- user/pho/stress2/misc/linger2.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/linger2.sh Mon May 1 07:44:34 2017 (r317638) @@ -54,7 +54,7 @@ set `df -i $mntpoint | tail -1 | awk '{p min=24 [ -r $mntpoint/.sujournal ] && { size=88; min=8232; } -if ! su ${testuser} -c "cd $mntpoint; /tmp/linger2 $size 2>/dev/null"; then +if ! su $testuser -c "cd $mntpoint; /tmp/linger2 $size 2>/dev/null"; then r=`df -i $mntpoint | head -1` echo " $r" for i in `jot 12`; do Modified: user/pho/stress2/misc/linger3.sh ============================================================================== --- user/pho/stress2/misc/linger3.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/linger3.sh Mon May 1 07:44:34 2017 (r317638) @@ -59,7 +59,7 @@ su $testuser -c "/tmp/linger3" cd $here while mount | grep -q $mntpoint; do - umount ${mntpoint} 2> /dev/null || sleep 1 + umount $mntpoint 2> /dev/null || sleep 1 done mdconfig -d -u $mdstart rm -f /tmp/linger3 Modified: user/pho/stress2/misc/linger4.sh ============================================================================== --- user/pho/stress2/misc/linger4.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/linger4.sh Mon May 1 07:44:34 2017 (r317638) @@ -60,7 +60,7 @@ su $testuser -c "/tmp/linger4" || cd $here while mount | grep -q $mntpoint; do - umount ${mntpoint} 2> /dev/null || sleep 1 + umount $mntpoint 2> /dev/null || sleep 1 done mdconfig -d -u $mdstart rm -f /tmp/linger4 Modified: user/pho/stress2/misc/md.sh ============================================================================== --- user/pho/stress2/misc/md.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/md.sh Mon May 1 07:44:34 2017 (r317638) @@ -35,15 +35,15 @@ . ../default.cfg -mount | grep "$mntpoint" | grep md${mdstart}${part} > /dev/null && umount $mntpoint +mount | grep "$mntpoint" | grep md${mdstart}$part > /dev/null && umount $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s 2m -u $mdstart -bsdlabel -w md${mdstart} auto -newfs md${mdstart}${part} > /dev/null +bsdlabel -w md$mdstart auto +newfs md${mdstart}$part > /dev/null mount /dev/md${mdstart}$part $mntpoint -export RUNDIR=${mntpoint}/stressX +export RUNDIR=$mntpoint/stressX export KBLOCKS=30000 # Exaggerate disk capacity export INODES=8000 Modified: user/pho/stress2/misc/md3.sh ============================================================================== --- user/pho/stress2/misc/md3.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/md3.sh Mon May 1 07:44:34 2017 (r317638) @@ -38,10 +38,10 @@ mount | grep -q "$mntpoint" && umount $m mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 1400m -u $mdstart -bsdlabel -w md${mdstart} auto +bsdlabel -w md$mdstart auto -newfs $newfs_flags md5${part} > /dev/null -mount /dev/md5${part} $mntpoint +newfs $newfs_flags md5$part > /dev/null +mount /dev/md5$part $mntpoint # Stop FS "out of inodes" problem by only using 70% set `df -ik /mnt | tail -1 | awk '{print $4,$7}'` Modified: user/pho/stress2/misc/mmap4.sh ============================================================================== --- user/pho/stress2/misc/mmap4.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/mmap4.sh Mon May 1 07:44:34 2017 (r317638) @@ -48,7 +48,7 @@ mount | grep -q "$mntpoint" && umount $m mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 40m -u $mdstart -bsdlabel -w md${mdstart} auto +bsdlabel -w md$mdstart auto newfs $newfs_flags md${mdstart}$part > /dev/null mount /dev/md${mdstart}$part $mntpoint Modified: user/pho/stress2/misc/mount2.sh ============================================================================== --- user/pho/stress2/misc/mount2.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/mount2.sh Mon May 1 07:44:34 2017 (r317638) @@ -42,14 +42,14 @@ if [ $# -eq 0 ]; then for i in `jot $mounts`; do m=$(( i + mdstart - 1 )) [ ! -d ${mntpoint}$m ] && mkdir ${mntpoint}$m - mount | grep "${mntpoint}" | grep -q md$m && + mount | grep "$mntpoint" | grep -q md$m && umount ${mntpoint}$m mdconfig -l | grep -q md$m && mdconfig -d -u $m dd if=/dev/zero of=$D$m bs=1m count=1 > /dev/null 2>&1 mdconfig -a -t vnode -f $D$m -u $m || { rm -f $D$m; exit 1; } bsdlabel -w md$m auto - newfs md${m}${part} > /dev/null 2>&1 + newfs md${m}$part > /dev/null 2>&1 done # start the parallel tests @@ -74,7 +74,7 @@ else for i in `jot 1024`; do m=$1 opt=`[ $(( m % 2 )) -eq 0 ] && echo -f` - mount /dev/md${m}${part} ${mntpoint}$m + mount /dev/md${m}$part ${mntpoint}$m while mount | grep -q ${mntpoint}$m; do umount $opt ${mntpoint}$m > /dev/null 2>&1 done Modified: user/pho/stress2/misc/mountro.sh ============================================================================== --- user/pho/stress2/misc/mountro.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/mountro.sh Mon May 1 07:44:34 2017 (r317638) @@ -36,19 +36,19 @@ D=$diskimage dede $D 1m 128 || exit -mount | grep "$mntpoint" | grep -q /md && umount -f ${mntpoint} -mdconfig -l | grep -q ${mdstart} && mdconfig -d -u $mdstart +mount | grep "$mntpoint" | grep -q /md && umount -f $mntpoint +mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart mdconfig -a -t vnode -f $D -u $mdstart || { rm -f $D; exit 1; } -bsdlabel -w md${mdstart} auto -newfs $newfs_flags md${mdstart}${part} > /dev/null 2>&1 -mount /dev/md${mdstart}${part} $mntpoint +bsdlabel -w md$mdstart auto +newfs $newfs_flags md${mdstart}$part > /dev/null 2>&1 +mount /dev/md${mdstart}$part $mntpoint -mkdir ${mntpoint}/stressX -chmod 777 ${mntpoint}/stressX +mkdir $mntpoint/stressX +chmod 777 $mntpoint/stressX -export RUNDIR=${mntpoint}/stressX +export RUNDIR=$mntpoint/stressX export runRUNTIME=4m (cd ..; ./run.sh disk.cfg > /dev/null 2>&1) & sleep 30 Modified: user/pho/stress2/misc/mountro2.sh ============================================================================== --- user/pho/stress2/misc/mountro2.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/mountro2.sh Mon May 1 07:44:34 2017 (r317638) @@ -38,14 +38,14 @@ D=$diskimage dede $D 1m 20 || exit -mount | grep "$mntpoint" | grep -q /md && umount -f ${mntpoint} -mdconfig -l | grep -q ${mdstart} && mdconfig -d -u $mdstart +mount | grep "$mntpoint" | grep -q /md && umount -f $mntpoint +mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart mdconfig -a -t vnode -f $D -u $mdstart || { rm -f $D; exit 1; } -bsdlabel -w md${mdstart} auto -newfs $newfs_flags md${mdstart}${part} > /dev/null 2>&1 -mount /dev/md${mdstart}${part} $mntpoint +bsdlabel -w md$mdstart auto +newfs $newfs_flags md${mdstart}$part > /dev/null 2>&1 +mount /dev/md${mdstart}$part $mntpoint mtree -deU -f /etc/mtree/BSD.usr.dist -p $mntpoint/ >> /dev/null sync ; sync ; sync Modified: user/pho/stress2/misc/mountro3.sh ============================================================================== --- user/pho/stress2/misc/mountro3.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/mountro3.sh Mon May 1 07:44:34 2017 (r317638) @@ -38,21 +38,21 @@ D=$diskimage dede $D 1m 64 || exit 1 -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 vnode -f $D -u ${mdstart} || { rm -f $D; exit 1; } -bsdlabel -w md${mdstart} auto -newfs $newfs_flags md${mdstart}${part} > /dev/null 2>&1 +mdconfig -a -t vnode -f $D -u $mdstart || { rm -f $D; exit 1; } +bsdlabel -w md$mdstart auto +newfs $newfs_flags md${mdstart}$part > /dev/null 2>&1 -mount /dev/md${mdstart}${part} $mntpoint +mount /dev/md${mdstart}$part $mntpoint touch $mntpoint/file umount $mntpoint -mount /dev/md${mdstart}${part} $mntpoint +mount /dev/md${mdstart}$part $mntpoint rm $mntpoint/file mount -u -o ro $mntpoint # Should fail with "Device busy" umount $mntpoint -mdconfig -d -u ${mdstart} +mdconfig -d -u $mdstart rm -f $D Modified: user/pho/stress2/misc/msdos.sh ============================================================================== --- user/pho/stress2/misc/msdos.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/msdos.sh Mon May 1 07:44:34 2017 (r317638) @@ -35,11 +35,11 @@ . ../default.cfg [ -x /sbin/mount_msdosfs ] || exit -mount | grep "$mntpoint" | grep -q md$mdstart && umount -f ${mntpoint} -mdconfig -l | grep -q ${mdstart} && mdconfig -d -u $mdstart +mount | grep "$mntpoint" | grep -q md$mdstart && umount -f $mntpoint +mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 1g -u $mdstart -bsdlabel -w md${mdstart} auto +bsdlabel -w md$mdstart auto newfs_msdos /dev/md${mdstart}$part > /dev/null mount -t msdosfs /dev/md${mdstart}$part $mntpoint Modified: user/pho/stress2/misc/msdos2.sh ============================================================================== --- user/pho/stress2/misc/msdos2.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/msdos2.sh Mon May 1 07:44:34 2017 (r317638) @@ -41,14 +41,14 @@ mount | grep "$mntpoint" | grep -q md$md mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 1g -u $mdstart -bsdlabel -w md${mdstart} auto +bsdlabel -w md$mdstart auto newfs_msdos /dev/md${mdstart}$part > /dev/null mount -t msdosfs /dev/md${mdstart}$part $mntpoint u=$((mdstart + 1)) mdconfig -l | grep -q $u && mdconfig -d -u $u mdconfig -a -t swap -s 1g -u $u -bsdlabel -w md${u} auto +bsdlabel -w md$u auto newfs_msdos /dev/md${u}$part > /dev/null mount -u /dev/md${u}$part $mntpoint > /dev/null 2>&1 # panic Modified: user/pho/stress2/misc/msdos3.sh ============================================================================== --- user/pho/stress2/misc/msdos3.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/msdos3.sh Mon May 1 07:44:34 2017 (r317638) @@ -41,7 +41,7 @@ mount | grep "$mntpoint" | grep -q md$md mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 1g -u $mdstart -bsdlabel -w md${mdstart} auto +bsdlabel -w md$mdstart auto newfs_msdos /dev/md${mdstart}$part > /dev/null mount -t msdosfs /dev/md${mdstart}$part $mntpoint Modified: user/pho/stress2/misc/msdos6.sh ============================================================================== --- user/pho/stress2/misc/msdos6.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/msdos6.sh Mon May 1 07:44:34 2017 (r317638) @@ -50,7 +50,7 @@ if [ $# -eq 0 ]; then mdconfig -a -t swap -s 1g -u $m bsdlabel -w md$m auto newfs_msdos -F 32 -b 8192 /dev/md${m}$part > /dev/null 2>&1 - mount -t msdosfs /dev/md${m}${part} ${mntpoint}$m + mount -t msdosfs /dev/md${m}$part ${mntpoint}$m (mkdir ${mntpoint}$m/test$i; cd ${mntpoint}$m/test$i; /tmp/fstool -l -f 100 -n 100 -s ${i}k) umount ${mntpoint}$m > /dev/null 2>&1 done Modified: user/pho/stress2/misc/msdos7.sh ============================================================================== --- user/pho/stress2/misc/msdos7.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/msdos7.sh Mon May 1 07:44:34 2017 (r317638) @@ -43,7 +43,7 @@ mount | grep -q "on $mntpoint " && umoun mdconfig -a -t swap -s 1g -u $mdstart bsdlabel -w md$mdstart auto newfs_msdos -F 32 -b 8192 /dev/md${mdstart}$part > /dev/null || exit 1 -mount -t msdosfs /dev/md${mdstart}${part} $mntpoint +mount -t msdosfs /dev/md${mdstart}$part $mntpoint here=`pwd` cd /tmp Modified: user/pho/stress2/misc/newfs3.sh ============================================================================== --- user/pho/stress2/misc/newfs3.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/newfs3.sh Mon May 1 07:44:34 2017 (r317638) @@ -73,7 +73,7 @@ while [ $size -le $((128 * 1024 * 1024)) done blocksize=$((blocksize * 2)) done - mdconfig -d -u ${mdstart} + mdconfig -d -u $mdstart size=$((size + 32 * 1024 * 1024)) done rm -f $diskimage Modified: user/pho/stress2/misc/nfs2.sh ============================================================================== --- user/pho/stress2/misc/nfs2.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/nfs2.sh Mon May 1 07:44:34 2017 (r317638) @@ -42,22 +42,22 @@ D=$diskimage dede $D 1m 128 || exit mount | grep "${mntpoint}2" | grep nfs > /dev/null && umount -f ${mntpoint}2 -mount | grep "$mntpoint" | grep /md > /dev/null && umount -f ${mntpoint} -mdconfig -l | grep -q ${mdstart} && mdconfig -d -u $mdstart +mount | grep "$mntpoint" | grep /md > /dev/null && umount -f $mntpoint +mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart mdconfig -a -t vnode -f $D -u $mdstart -bsdlabel -w md${mdstart} auto +bsdlabel -w md$mdstart auto newfs_msdos -F 16 -b 8192 /dev/md${mdstart}$part > /dev/null mount -t msdosfs -o rw /dev/md${mdstart}$part $mntpoint -mkdir ${mntpoint}/stressX -chmod 777 ${mntpoint}/stressX +mkdir $mntpoint/stressX +chmod 777 $mntpoint/stressX [ ! -d ${mntpoint}2 ] && mkdir ${mntpoint}2 chmod 777 ${mntpoint}2 -mount -t nfs -o tcp -o retrycnt=3 -o intr -o soft -o rw \ +mount -t nfs -o tcp -o retrycnt=3 -o intr,soft -o rw \ 127.0.0.1:$mntpoint ${mntpoint}2 export INODES=9999 # No inodes on a msdos fs Modified: user/pho/stress2/misc/nullfs11.sh ============================================================================== --- user/pho/stress2/misc/nullfs11.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/nullfs11.sh Mon May 1 07:44:34 2017 (r317638) @@ -57,7 +57,7 @@ test() { mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 2g -u $mdstart || exit 1 bsdlabel -w md$mdstart auto - newfs $newfs_flags md${mdstart}${part} > /dev/null + newfs $newfs_flags md${mdstart}$part > /dev/null mount /dev/md${mdstart}$part $mp1 mount -t nullfs $opt $mp1 $mp2 Modified: user/pho/stress2/misc/pfl.sh ============================================================================== --- user/pho/stress2/misc/pfl.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/pfl.sh Mon May 1 07:44:34 2017 (r317638) @@ -71,8 +71,8 @@ newfs $opt md${md2}$part > /dev/null mount /dev/md${md2}$part $mp2 chmod 777 $mp2 -su ${testuser} -c "cd $mp1; /tmp/pfl" & -su ${testuser} -c "cd $mp2; /tmp/pfl" & +su $testuser -c "cd $mp1; /tmp/pfl" & +su $testuser -c "cd $mp2; /tmp/pfl" & sleep .5 start=`date '+%s'` while pgrep -q pfl; do Modified: user/pho/stress2/misc/quota1.sh ============================================================================== --- user/pho/stress2/misc/quota1.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/quota1.sh Mon May 1 07:44:34 2017 (r317638) @@ -48,7 +48,7 @@ mdconfig -a -t vnode -f $D -u $mdstart bsdlabel -w md$mdstart auto newfs $newfs_flags md${mdstart}$part > /dev/null mount /dev/md${mdstart}$part $mntpoint -export RUNDIR=${mntpoint}/stressX +export RUNDIR=$mntpoint/stressX export runRUNTIME=10m # Run tests for 10 minutes (cd ..; ./run.sh disk.cfg) while mount | grep -q $mntpoint; do Modified: user/pho/stress2/misc/quota10.sh ============================================================================== --- user/pho/stress2/misc/quota10.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/quota10.sh Mon May 1 07:44:34 2017 (r317638) @@ -54,7 +54,7 @@ if [ $# -eq 0 ]; then dede $D$m 1m 1 mdconfig -a -t vnode -f $D$m -u $m bsdlabel -w md$m auto - newfs md${m}${part} > /dev/null 2>&1 + newfs md${m}$part > /dev/null 2>&1 echo "/dev/md${m}$part ${mntpoint}$m ufs rw,userquota 2 2" \ >> $PATH_FSTAB mount ${mntpoint}$m @@ -93,7 +93,7 @@ else for i in `jot 200`; do m=$1 opt=`[ $(( m % 2 )) -eq 0 ] && echo -f` - mount $opt /dev/md${m}${part} ${mntpoint}$m + mount $opt /dev/md${m}$part ${mntpoint}$m while mount | grep -qw $mntpoint$m; do opt=$([ $((`date '+%s'` % 2)) -eq 0 ] && echo "-f") Modified: user/pho/stress2/misc/quota2.sh ============================================================================== --- user/pho/stress2/misc/quota2.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/quota2.sh Mon May 1 07:44:34 2017 (r317638) @@ -45,11 +45,11 @@ mdconfig -a -t vnode -f $D -u $mdstart bsdlabel -w md$mdstart auto newfs $newfs_flags md${mdstart}$part > /dev/null echo "/dev/md${mdstart}$part $mntpoint ufs rw,userquota 2 2" > $PATH_FSTAB -mount ${mntpoint} +mount $mntpoint edquota -u -f $mntpoint -e $mntpoint:100000:110000:15000:16000 root quotacheck $mntpoint quotaon $mntpoint -export RUNDIR=${mntpoint}/stressX +export RUNDIR=$mntpoint/stressX export runRUNTIME=10m # Run tests for 10 minutes (cd ..; ./run.sh disk.cfg) 2>/dev/null while mount | grep $mntpoint | grep -q /dev/md; do Modified: user/pho/stress2/misc/quota3.sh ============================================================================== --- user/pho/stress2/misc/quota3.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/quota3.sh Mon May 1 07:44:34 2017 (r317638) @@ -38,14 +38,14 @@ export PATH_FSTAB=/tmp/fstab trap "rm -f $D $PATH_FSTAB" 0 dede $D 1m 1k || exit 1 -mount | grep "${mntpoint}" | grep -q md${mdstart}$part && umount ${mntpoint} +mount | grep "$mntpoint" | grep -q md${mdstart}$part && umount $mntpoint mdconfig -l | grep md$mdstart > /dev/null && mdconfig -d -u $mdstart mdconfig -a -t vnode -f $D -u $mdstart bsdlabel -w md$mdstart auto newfs $newfs_flags md${mdstart}$part > /dev/null echo "/dev/md${mdstart}$part $mntpoint ufs rw,userquota 2 2" > $PATH_FSTAB -mount ${mntpoint} +mount $mntpoint edquota -u -f $mntpoint -e $mntpoint:850000:900000:130000:140000 root quotacheck $mntpoint quotaon $mntpoint Modified: user/pho/stress2/misc/quota4.sh ============================================================================== --- user/pho/stress2/misc/quota4.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/quota4.sh Mon May 1 07:44:34 2017 (r317638) @@ -42,10 +42,10 @@ dede $D 1m 1k || exit 1 mount | grep "$mntpoint" | grep md${mdstart}$part > /dev/null && umount \ $mntpoint -mdconfig -l | grep md${mdstart} > /dev/null && mdconfig -d -u ${mdstart} +mdconfig -l | grep md$mdstart > /dev/null && mdconfig -d -u $mdstart -mdconfig -a -t vnode -f $D -u ${mdstart} -bsdlabel -w md${mdstart} auto +mdconfig -a -t vnode -f $D -u $mdstart +bsdlabel -w md$mdstart auto newfs $newfs_flags md${mdstart}$part > /dev/null echo "/dev/md${mdstart}$part $mntpoint ufs rw,userquota 2 2" >> \ /etc/fstab @@ -53,8 +53,8 @@ mount $mntpoint edquota -u -f $mntpoint -e ${mntpoint}:850000:900000:130000:140000 root \ > /dev/null 2>&1 quotaon $mntpoint -sed -i -e "/md${mdstart}${part}/d" /etc/fstab # clean up before any panics -export RUNDIR=${mntpoint}/stressX +sed -i -e "/md${mdstart}$part/d" /etc/fstab # clean up before any panics +export RUNDIR=$mntpoint/stressX ../testcases/rw/rw -t 2m -i 200 -h -n 2>/dev/null & sleep 60 false @@ -62,6 +62,6 @@ while mount | grep -q $mntpoint; do umount $([ $((`date '+%s'` % 2)) -eq 0 ] && echo "-f" || echo "") \ $mntpoint > /dev/null 2>&1 done -mdconfig -d -u ${mdstart} +mdconfig -d -u $mdstart rm -f $D exit 0 Modified: user/pho/stress2/misc/quota7.sh ============================================================================== --- user/pho/stress2/misc/quota7.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/quota7.sh Mon May 1 07:44:34 2017 (r317638) @@ -47,7 +47,7 @@ mdconfig -a -t vnode -f $D -u $mdstart bsdlabel -w md$mdstart auto newfs $newfs_flags md${mdstart}$part > /dev/null export PATH_FSTAB=/tmp/fstab -echo "/dev/md${mdstart}${part} $mntpoint ufs rw,userquota 2 2" > $PATH_FSTAB +echo "/dev/md${mdstart}$part $mntpoint ufs rw,userquota 2 2" > $PATH_FSTAB mount $mntpoint set `df -ik $mntpoint | tail -1 | awk '{print $4,$7}'` export KBLOCKS=$(($1 / 21)) Modified: user/pho/stress2/misc/quota8.sh ============================================================================== --- user/pho/stress2/misc/quota8.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/quota8.sh Mon May 1 07:44:34 2017 (r317638) @@ -66,20 +66,20 @@ edquota -u -f $mntpoint -e ${mntpoint}:$ $testuser quotaon $mntpoint sed -i -e "/md${mdstart}$part/d" /etc/fstab -export RUNDIR=${mntpoint}/stressX -mkdir ${mntpoint}/stressX -chmod 777 ${mntpoint}/stressX +export RUNDIR=$mntpoint/stressX +mkdir $mntpoint/stressX +chmod 777 $mntpoint/stressX su $testuser -c 'sh -c "(cd ..;runRUNTIME=20m ./run.sh disk.cfg > \ /dev/null 2>&1)"&' for i in `jot 20`; do - echo "`date '+%T'` mksnap_ffs $mntpoint ${mntpoint}/.snap/snap$i" - mksnap_ffs $mntpoint ${mntpoint}/.snap/snap$i + echo "`date '+%T'` mksnap_ffs $mntpoint $mntpoint/.snap/snap$i" + mksnap_ffs $mntpoint $mntpoint/.snap/snap$i sleep 1 done # Remove random snapshot file i=$((`date +%S` % 20 + 1)) -echo "rm -f ${mntpoint}/.snap/snap$i" -rm -f ${mntpoint}/.snap/snap$i +echo "rm -f $mntpoint/.snap/snap$i" +rm -f $mntpoint/.snap/snap$i wait su $testuser -c 'sh -c "../tools/killall.sh"' Modified: user/pho/stress2/misc/quota9.sh ============================================================================== --- user/pho/stress2/misc/quota9.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/quota9.sh Mon May 1 07:44:34 2017 (r317638) @@ -57,8 +57,8 @@ if [ $# -eq 0 ]; then echo "/dev/md${mdstart}$part $mntpoint ufs rw,userquota 2 2" \ >> /etc/fstab mount $mntpoint - mkdir ${mntpoint}/stressX - chown $testuser ${mntpoint}/stressX + mkdir $mntpoint/stressX + chown $testuser $mntpoint/stressX set `df -ik $mntpoint | tail -1 | awk '{print $4,$7}'` export KBLOCKS=$1 export INODES=$2 @@ -72,12 +72,12 @@ if [ $# -eq 0 ]; then qc $mntpoint - su ${testuser} $0 xxx + su $testuser $0 xxx du -k /mnt/stressX qc $mntpoint - sed -i -e "/md${mdstart}${part}/d" /etc/fstab + sed -i -e "/md${mdstart}$part/d" /etc/fstab while mount | grep -q $mntpoint; do umount $([ $((`date '+%s'` % 2)) -eq 0 ] && echo "-f" || echo "") $mntpoint > /dev/null 2>&1 Modified: user/pho/stress2/misc/rename11.sh ============================================================================== --- user/pho/stress2/misc/rename11.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/rename11.sh Mon May 1 07:44:34 2017 (r317638) @@ -49,9 +49,9 @@ bsdlabel -w md$mdstart auto newfs $newfs_flags md${mdstart}$part > /dev/null mount /dev/md${mdstart}$part $mntpoint -mkdir ${mntpoint}/dir +mkdir $mntpoint/dir ( - cd ${mntpoint}/dir + cd $mntpoint/dir /tmp/rename11 || echo FAIL ) Modified: user/pho/stress2/misc/rename3.sh ============================================================================== --- user/pho/stress2/misc/rename3.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/rename3.sh Mon May 1 07:44:34 2017 (r317638) @@ -39,15 +39,15 @@ root=/tmp for i in `jot 10000`; do - rm -rf ${root}/a - mkdir -p ${root}/a/b/c/d/e/f/g - mkdir -p ${root}/a/b/c/d/e/f/z - cd ${root}/a/b/c/d/e/f - ( mv ${root}/a/b/c ${root}/a/c ) & + rm -rf $root/a + mkdir -p $root/a/b/c/d/e/f/g + mkdir -p $root/a/b/c/d/e/f/z + cd $root/a/b/c/d/e/f + ( mv $root/a/b/c $root/a/c ) & if ! mv z g/z; then echo "FAILURE at loop $i" break fi wait done -rm -rf ${root}/a +rm -rf $root/a Modified: user/pho/stress2/misc/rename5.sh ============================================================================== --- user/pho/stress2/misc/rename5.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/rename5.sh Mon May 1 07:44:34 2017 (r317638) @@ -43,7 +43,7 @@ mount | grep -q "$mntpoint" && umount $m mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 1g -u $mdstart -bsdlabel -w md${mdstart} auto +bsdlabel -w md$mdstart auto newfs $newfs_flags md${mdstart}$part > /dev/null mount /dev/md${mdstart}$part $mntpoint Modified: user/pho/stress2/misc/rename6.sh ============================================================================== --- user/pho/stress2/misc/rename6.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/rename6.sh Mon May 1 07:44:34 2017 (r317638) @@ -51,7 +51,7 @@ newfs $newfs_flags md${mdstart}$part > / mount /dev/md${mdstart}$part $mntpoint chmod 777 $mntpoint -su ${testuser} -c "cd $mntpoint; /tmp/rename6" +su $testuser -c "cd $mntpoint; /tmp/rename6" while mount | grep -q md${mdstart}$part; do umount $mntpoint || sleep 1 Modified: user/pho/stress2/misc/rename7.sh ============================================================================== --- user/pho/stress2/misc/rename7.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/rename7.sh Mon May 1 07:44:34 2017 (r317638) @@ -53,7 +53,7 @@ newfs $newfs_flags md${mdstart}$part > / mount /dev/md${mdstart}$part $mntpoint chmod 777 $mntpoint -su ${testuser} -c "cd $mntpoint; /tmp/rename7 || echo FAIL" +su $testuser -c "cd $mntpoint; /tmp/rename7 || echo FAIL" for i in `jot 10`; do mount | grep -q md${mdstart}$part && \ Modified: user/pho/stress2/misc/rename8.sh ============================================================================== --- user/pho/stress2/misc/rename8.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/rename8.sh Mon May 1 07:44:34 2017 (r317638) @@ -51,7 +51,7 @@ newfs $newfs_flags md${mdstart}$part > / mount /dev/md${mdstart}$part $mntpoint chmod 777 $mntpoint -su ${testuser} -c "cd $mntpoint; mkdir r; /tmp/rename8 r" +su $testuser -c "cd $mntpoint; mkdir r; /tmp/rename8 r" ls -li $mntpoint/r | egrep -v "^total" for i in `jot 10`; do Modified: user/pho/stress2/misc/rename9.sh ============================================================================== --- user/pho/stress2/misc/rename9.sh Mon May 1 06:42:39 2017 (r317637) +++ user/pho/stress2/misc/rename9.sh Mon May 1 07:44:34 2017 (r317638) @@ -51,7 +51,7 @@ rm -rf $mntpoint/.snap chmod 777 $mntpoint (while true; do ls -lRi $mntpoint > /dev/null 2>&1; done) & -su ${testuser} -c "cd $mntpoint; /tmp/rename9" +su $testuser -c "cd $mntpoint; /tmp/rename9" kill $! > /dev/null 2>&1 wait ls -ilR $mntpoint | egrep -v "^total " Modified: user/pho/stress2/misc/snap2.sh ============================================================================== --- user/pho/stress2/misc/snap2.sh Mon May 1 06:42:39 2017 (r317637) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705010744.v417iY0b029875>