Date: Tue, 25 Apr 2017 09:08:44 +0000 (UTC) From: Peter Holm <pho@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r317401 - user/pho/stress2/misc Message-ID: <201704250908.v3P98i4I084988@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pho Date: Tue Apr 25 09:08:44 2017 New Revision: 317401 URL: https://svnweb.freebsd.org/changeset/base/317401 Log: Added check for QUOTA configured. Style fix while here. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/quota1.sh user/pho/stress2/misc/quota10.sh user/pho/stress2/misc/quota11.sh user/pho/stress2/misc/quota2.sh user/pho/stress2/misc/quota3.sh user/pho/stress2/misc/quota4.sh user/pho/stress2/misc/quota5.sh user/pho/stress2/misc/quota6.sh user/pho/stress2/misc/quota7.sh user/pho/stress2/misc/quota8.sh user/pho/stress2/misc/quota9.sh user/pho/stress2/misc/suj18.sh user/pho/stress2/misc/suj19.sh Modified: user/pho/stress2/misc/quota1.sh ============================================================================== --- user/pho/stress2/misc/quota1.sh Tue Apr 25 08:34:39 2017 (r317400) +++ user/pho/stress2/misc/quota1.sh Tue Apr 25 09:08:44 2017 (r317401) @@ -31,7 +31,8 @@ [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 # Causes this: panic: mutex Giant not owned at ../../../kern/vfs_subr.c:1968 -# with a kernel compiled with "options QUOTA" +# with a kernel compiled with "options QUOTA". +# This is not really a quota test. . ../default.cfg @@ -39,7 +40,8 @@ D=$diskimage trap "rm -f $D" 0 dede $D 1m 128 || exit 1 -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 vnode -f $D -u $mdstart @@ -54,3 +56,4 @@ while mount | grep -q $mntpoint; do done mdconfig -d -u $mdstart rm -f $D +exit 0 Modified: user/pho/stress2/misc/quota10.sh ============================================================================== --- user/pho/stress2/misc/quota10.sh Tue Apr 25 08:34:39 2017 (r317400) +++ user/pho/stress2/misc/quota10.sh Tue Apr 25 09:08:44 2017 (r317401) @@ -29,8 +29,11 @@ # # Hunt for deadlock that could occur running umount and quota at the same time +# "panic: dqsync: file" seen: +# https://people.freebsd.org/~pho/stress/log/quota10.txt [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 +[ "`sysctl -in kern.features.ufs_quota`" != "1" ] && exit 0 . ../default.cfg @@ -42,18 +45,21 @@ export PATH_FSTAB=/tmp/fstab if [ $# -eq 0 ]; then rm -f $PATH_FSTAB for i in `jot $mounts`; do - m=$(( i + mdstart - 1 )) + m=$((i + mdstart - 1)) [ ! -d ${mntpoint}$m ] && mkdir ${mntpoint}$m - mount | grep "$mntpoint" | grep -q md$m && umount ${mntpoint}$m - mdconfig -l | grep -q md$m && mdconfig -d -u $m + mount | grep "$mntpoint" | grep -q md$m && + umount ${mntpoint}$m + [ -c /dev/md$m ] && mdconfig -d -u $m 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 - echo "/dev/md${m}${part} ${mntpoint}$m ufs rw,userquota 2 2" >> $PATH_FSTAB + echo "/dev/md${m}$part ${mntpoint}$m ufs rw,userquota 2 2" \ + >> $PATH_FSTAB mount ${mntpoint}$m - edquota -u -f ${mntpoint}$m -e ${mntpoint}$m:100000:110000:15000:16000 root + edquota -u -f ${mntpoint}$m -e \ + ${mntpoint}$m:100000:110000:15000:16000 root umount ${mntpoint}$m done sync;sync;sync @@ -61,14 +67,14 @@ if [ $# -eq 0 ]; then # start the parallel tests touch /tmp/$0 for i in `jot $mounts`; do - m=$(( i + mdstart - 1 )) + m=$((i + mdstart - 1)) ./$0 $m & ./$0 find $m & done wait for i in `jot $mounts`; do - m=$(( i + mdstart - 1 )) + m=$((i + mdstart - 1)) mdconfig -d -u $m rm -f $D$m done @@ -89,10 +95,12 @@ else opt=`[ $(( m % 2 )) -eq 0 ] && echo -f` mount $opt /dev/md${m}${part} ${mntpoint}$m while mount | grep -qw $mntpoint$m; do - opt=$([ $((`date '+%s'` % 2)) -eq 0 ] && echo "-f") + opt=$([ $((`date '+%s'` % 2)) -eq 0 ] && + echo "-f") umount $opt ${mntpoint}$m > /dev/null 2>&1 done done rm -f /tmp/$0 fi fi +exit 0 Modified: user/pho/stress2/misc/quota11.sh ============================================================================== --- user/pho/stress2/misc/quota11.sh Tue Apr 25 08:34:39 2017 (r317400) +++ user/pho/stress2/misc/quota11.sh Tue Apr 25 09:08:44 2017 (r317401) @@ -35,6 +35,7 @@ # Test scenario by Hiroki Sato <hrs FreeBSD org> [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 +[ "`sysctl -in kern.features.ufs_quota`" != "1" ] && exit 0 . ../default.cfg @@ -58,7 +59,11 @@ dd if=/dev/random of=$mntpoint/foo.data kill $! wait +n=0 while mount | grep "on $mntpoint " | grep -q /dev/md; do umount $mntpoint || sleep 1 + n=$((n + 1)) + [ $n -gt 60 ] && exit 1 done mdconfig -d -u $mdstart +exit 0 Modified: user/pho/stress2/misc/quota2.sh ============================================================================== --- user/pho/stress2/misc/quota2.sh Tue Apr 25 08:34:39 2017 (r317400) +++ user/pho/stress2/misc/quota2.sh Tue Apr 25 09:08:44 2017 (r317401) @@ -29,6 +29,7 @@ # [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 +[ "`sysctl -in kern.features.ufs_quota`" != "1" ] && exit 0 . ../default.cfg @@ -50,8 +51,9 @@ quotacheck $mntpoint quotaon $mntpoint export RUNDIR=${mntpoint}/stressX export runRUNTIME=10m # Run tests for 10 minutes -(cd ..; ./run.sh disk.cfg) +(cd ..; ./run.sh disk.cfg) 2>/dev/null while mount | grep $mntpoint | grep -q /dev/md; do umount $mntpoint || sleep 1 done mdconfig -d -u $mdstart +exit 0 Modified: user/pho/stress2/misc/quota3.sh ============================================================================== --- user/pho/stress2/misc/quota3.sh Tue Apr 25 08:34:39 2017 (r317400) +++ user/pho/stress2/misc/quota3.sh Tue Apr 25 09:08:44 2017 (r317401) @@ -29,6 +29,7 @@ # [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 +[ "`sysctl -in kern.features.ufs_quota`" != "1" ] && exit 0 . ../default.cfg Modified: user/pho/stress2/misc/quota4.sh ============================================================================== --- user/pho/stress2/misc/quota4.sh Tue Apr 25 08:34:39 2017 (r317400) +++ user/pho/stress2/misc/quota4.sh Tue Apr 25 09:08:44 2017 (r317401) @@ -29,6 +29,7 @@ # [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 +[ "`sysctl -in kern.features.ufs_quota`" != "1" ] && exit 0 # Has shown a deadlock after 7 hours of testing # https://people.freebsd.org/~pho/stress/log/quota4.txt @@ -39,23 +40,28 @@ D=$diskimage trap "rm -f $D" 0 dede $D 1m 1k || exit 1 -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 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 -mount ${mntpoint} -edquota -u -f ${mntpoint} -e ${mntpoint}:850000:900000:130000:140000 root > /dev/null 2>&1 -quotaon ${mntpoint} +newfs $newfs_flags md${mdstart}$part > /dev/null +echo "/dev/md${mdstart}$part $mntpoint ufs rw,userquota 2 2" >> \ + /etc/fstab +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 -../testcases/rw/rw -t 2m -i 200 -h -n -v -v& +../testcases/rw/rw -t 2m -i 200 -h -n 2>/dev/null & sleep 60 false -while mount | grep -q ${mntpoint}; do - umount $([ $((`date '+%s'` % 2)) -eq 0 ] && echo "-f" || echo "") ${mntpoint} > /dev/null 2>&1 +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} rm -f $D +exit 0 Modified: user/pho/stress2/misc/quota5.sh ============================================================================== --- user/pho/stress2/misc/quota5.sh Tue Apr 25 08:34:39 2017 (r317400) +++ user/pho/stress2/misc/quota5.sh Tue Apr 25 09:08:44 2017 (r317401) @@ -29,6 +29,7 @@ # [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 +[ "`sysctl -in kern.features.ufs_quota`" != "1" ] && exit 0 mount | grep -q "on /tmp (ufs," || exit 0 if ! grep /tmp /etc/fstab | grep -q quota ; then Modified: user/pho/stress2/misc/quota6.sh ============================================================================== --- user/pho/stress2/misc/quota6.sh Tue Apr 25 08:34:39 2017 (r317400) +++ user/pho/stress2/misc/quota6.sh Tue Apr 25 09:08:44 2017 (r317401) @@ -29,6 +29,7 @@ # [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 +[ "`sysctl -in kern.features.ufs_quota`" != "1" ] && exit 0 . ../default.cfg @@ -44,9 +45,11 @@ 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 -edquota -u -f $mntpoint -e $mntpoint:850000:900000:130000:140000 root > /dev/null 2>&1 +edquota -u -f $mntpoint -e $mntpoint:850000:900000:130000:140000 root > \ + /dev/null 2>&1 quotaon $mntpoint export RUNDIR=$mntpoint/stressX ../testcases/rw/rw -t 10m -i 200 -h -n & @@ -60,8 +63,9 @@ for i in `jot 5`; do done kill $pid wait -while mount | grep -q ${mntpoint}; do - umount ${mntpoint} || sleep 1 +while mount | grep -q $mntpoint; do + umount $mntpoint || sleep 1 done mdconfig -d -u $mdstart rm -f $D $PATH_FSTAB +exit 0 Modified: user/pho/stress2/misc/quota7.sh ============================================================================== --- user/pho/stress2/misc/quota7.sh Tue Apr 25 08:34:39 2017 (r317400) +++ user/pho/stress2/misc/quota7.sh Tue Apr 25 09:08:44 2017 (r317401) @@ -32,6 +32,7 @@ # Causes spin in ffs_sync or panic in panic: vfs_allocate_syncvnode: insmntque failed [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 +[ "`sysctl -in kern.features.ufs_quota`" != "1" ] && exit 0 . ../default.cfg @@ -46,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)) @@ -73,8 +74,8 @@ echo "rm -f $mntpoint/.snap/snap$i" rm -f $mntpoint/.snap/snap$i wait -while mount | grep -q ${mntpoint}; do - umount ${mntpoint} || sleep 1 +while mount | grep -q $mntpoint; do + umount $mntpoint || sleep 1 done mdconfig -d -u $mdstart rm -f $D $PATH_FSTAB Modified: user/pho/stress2/misc/quota8.sh ============================================================================== --- user/pho/stress2/misc/quota8.sh Tue Apr 25 08:34:39 2017 (r317400) +++ user/pho/stress2/misc/quota8.sh Tue Apr 25 09:08:44 2017 (r317401) @@ -29,9 +29,15 @@ # # Quota / snapshot test scenario by Kris@ -# Causes spin in ffs_sync or panic in panic: vfs_allocate_syncvnode: insmntque failed +# Causes spin in ffs_sync or panic in panic: vfs_allocate_syncvnode: +# insmntque failed + +# "Fatal double fault" seen when compiling selected files +# with "-O0" on i386: +# https://people.freebsd.org/~pho/stress/log/quota8.txt [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 +[ "`sysctl -in kern.features.ufs_quota`" != "1" ] && exit 0 . ../default.cfg @@ -39,15 +45,16 @@ D=$diskimage trap "rm -f $D" 0 dede $D 1m 1k || exit 1 -mount | grep "${mntpoint}" | grep -q md${mdstart} && umount -f ${mntpoint} -mdconfig -l | grep -q md${mdstart} && mdconfig -d -u ${mdstart} +mount | grep "$mntpoint" | grep -q md$mdstart && umount -f $mntpoint +[ -c /dev/md$mdstart ] && 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" >> /etc/fstab -mount ${mntpoint} -set `df -ik ${mntpoint} | tail -1 | awk '{print $4,$7}'` +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 +mount $mntpoint +set `df -ik $mntpoint | tail -1 | awk '{print $4,$7}'` export KBLOCKS=$(($1 / 21)) export INODES=$(($2 / 21)) export HOG=1 @@ -55,26 +62,30 @@ export INCARNATIONS=40 export QK=$((KBLOCKS / 2)) export QI=$((INODES / 2)) -edquota -u -f ${mntpoint} -e ${mntpoint}:$((QK - 50)):$QK:$((QI - 50 )):$QI ${testuser} -quotaon ${mntpoint} -sed -i -e "/md${mdstart}${part}/d" /etc/fstab +edquota -u -f $mntpoint -e ${mntpoint}:$((QK - 50)):$QK:$((QI - 50 )):$QI \ +$testuser +quotaon $mntpoint +sed -i -e "/md${mdstart}$part/d" /etc/fstab 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)"&' # Deadlock +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 -i=$(($(date '+%S') % 20 + 1)) +# Remove random snapshot file +i=$((`date +%S` % 20 + 1)) echo "rm -f ${mntpoint}/.snap/snap$i" rm -f ${mntpoint}/.snap/snap$i wait -su ${testuser} -c 'sh -c "../tools/killall.sh"' -while mount | grep -q ${mntpoint}; do - umount $([ $((`date '+%s'` % 2)) -eq 0 ] && echo "-f" || echo "") ${mntpoint} > /dev/null 2>&1 +su $testuser -c 'sh -c "../tools/killall.sh"' +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} -rm -f $D +mdconfig -d -u $mdstart +exit 0 Modified: user/pho/stress2/misc/quota9.sh ============================================================================== --- user/pho/stress2/misc/quota9.sh Tue Apr 25 08:34:39 2017 (r317400) +++ user/pho/stress2/misc/quota9.sh Tue Apr 25 09:08:44 2017 (r317401) @@ -43,52 +43,50 @@ qc() { if [ $# -eq 0 ]; then trap "rm -f $D $tmp" 0 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 + [ "`sysctl -in kern.features.ufs_quota`" != "1" ] && exit 0 dede $D 1m 50 || exit 1 - mount | grep "${mntpoint}" | grep -q md${mdstart} && umount -f ${mntpoint} - mdconfig -l | grep -q md${mdstart} && 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" >> /etc/fstab - mount ${mntpoint} + mount | grep "$mntpoint" | grep -q md$mdstart && + umount -f $mntpoint + [ -c /dev/md$mdstart ] && 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" \ + >> /etc/fstab + mount $mntpoint mkdir ${mntpoint}/stressX chown $testuser ${mntpoint}/stressX - set `df -ik ${mntpoint} | tail -1 | awk '{print $4,$7}'` + set `df -ik $mntpoint | tail -1 | awk '{print $4,$7}'` export KBLOCKS=$1 export INODES=$2 export QK=$((KBLOCKS / 2)) export QI=$((INODES / 2)) - edquota -u -f ${mntpoint} -e ${mntpoint}:$((QK - 50)):$QK:$((QI - 50 )):$QI ${testuser} > /dev/null 2>&1 - quotaon ${mntpoint} + edquota -u -f $mntpoint -e \ + ${mntpoint}:$((QK - 50)):$QK:$((QI - 50 )):$QI $testuser > \ + /dev/null 2>&1 + quotaon $mntpoint -# quotaoff ${mntpoint};umount ${mntpoint}; mount ${mntpoint};quotaon ${mntpoint} -# df -i ${mntpoint} -# repquota -v ${mntpoint} - qc ${mntpoint} -# repquota -v ${mntpoint} -# echo "- Start test -" + qc $mntpoint su ${testuser} $0 xxx du -k /mnt/stressX -# quotaoff ${mntpoint};umount ${mntpoint}; mount ${mntpoint};quotaon ${mntpoint} -# df -i ${mntpoint} -# repquota -v ${mntpoint} - qc ${mntpoint} -# repquota -v ${mntpoint} + qc $mntpoint 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 + 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 else for i in `jot 20`; do - dede ${mntpoint}/stressX/d$i 1m 1 + dede $mntpoint/stressX/d$i 1m 1 done fi +exit 0 Modified: user/pho/stress2/misc/suj18.sh ============================================================================== --- user/pho/stress2/misc/suj18.sh Tue Apr 25 08:34:39 2017 (r317400) +++ user/pho/stress2/misc/suj18.sh Tue Apr 25 09:08:44 2017 (r317401) @@ -36,31 +36,35 @@ # Fixed by r305594. [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 +[ "`sysctl -in kern.features.ufs_quota`" != "1" ] && exit 0 . ../default.cfg -mount | grep "${mntpoint}" | grep -q md${mdstart} && umount ${mntpoint} -mdconfig -l | grep -q md${mdstart} && mdconfig -d -u ${mdstart} +mount | grep "$mntpoint" | grep -q md$mdstart && umount $mntpoint +mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 1g -u ${mdstart} -bsdlabel -w md${mdstart} auto -newfs -j md${mdstart}${part} > /dev/null +bsdlabel -w md$mdstart auto +newfs -j md${mdstart}$part > /dev/null export PATH_FSTAB=/tmp/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}'` +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 QK=$(($1 / 10 * 8)) export QI=$(($2 / 10 * 8)) -edquota -u -f ${mntpoint} -e ${mntpoint}:$((QK - 50)):$QK:$((QI - 50 )):$QI ${testuser} -quotaon ${mntpoint} +edquota -u -f $mntpoint -e ${mntpoint}:$((QK - 50)):$QK:$((QI - 50 )):$QI \ + $testuser +quotaon $mntpoint export RUNDIR=${mntpoint}/stressX -chmod 777 ${mntpoint} -su ${testuser} -c 'sh -c "(cd ..;runRUNTIME=20m ./run.sh disk.cfg > /dev/null 2>&1)"' +chmod 777 $mntpoint +su $testuser -c 'sh -c "(cd ..;runRUNTIME=20m ./run.sh disk.cfg > \ + /dev/null 2>&1)"' rm -f $PATH_FSTAB for i in `jot 6`; do umount $mntpoint && break || sleep 10 done [ $i -eq 6 ] && exit 1 -mdconfig -d -u ${mdstart} +mdconfig -d -u $mdstart exit 0 Modified: user/pho/stress2/misc/suj19.sh ============================================================================== --- user/pho/stress2/misc/suj19.sh Tue Apr 25 08:34:39 2017 (r317400) +++ user/pho/stress2/misc/suj19.sh Tue Apr 25 09:08:44 2017 (r317401) @@ -31,6 +31,7 @@ # SUJ, quota and snapshots test scenario [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 +[ "`sysctl -in kern.features.ufs_quota`" != "1" ] && exit 0 . ../default.cfg
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704250908.v3P98i4I084988>