svn commit: r258978 - user/pho/stress2/misc

[Peter Holm]

Author: pho
Date: Thu Dec  5 11:48:50 2013
New Revision: 258978
URL: http://svnweb.freebsd.org/changeset/base/258978

Log:
  Use newfs_flags, limit output and add extra cleanup code.
  
  Sponsored by:	EMC / Isilon storage division

Modified:
  user/pho/stress2/misc/quota8.sh

Modified: user/pho/stress2/misc/quota8.sh
==============================================================================
--- user/pho/stress2/misc/quota8.sh	Thu Dec  5 11:46:57 2013	(r258977)
+++ user/pho/stress2/misc/quota8.sh	Thu Dec  5 11:48:50 2013	(r258978)
@@ -44,7 +44,7 @@ mdconfig -l | grep -q md${mdstart} &&  m
 
 mdconfig -a -t vnode -f $D -u ${mdstart}
 bsdlabel -w md${mdstart} auto
-newfs -U  md${mdstart}${part} > /dev/null
+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}'`
@@ -61,7 +61,7 @@ sed -i -e "/md${mdstart}${part}/d" /etc/
 export RUNDIR=${mntpoint}/stressX
 mkdir ${mntpoint}/stressX
 chmod 777 ${mntpoint}/stressX
-su ${testuser} -c 'sh -c "(cd ..;runRUNTIME=20m ./run.sh disk.cfg)"&'   # Deadlock
+su ${testuser} -c 'sh -c "(cd ..;runRUNTIME=20m ./run.sh disk.cfg > /dev/null 2>&1)"&'   # Deadlock
 for i in `jot 20`; do
 	echo "`date '+%T'` mksnap_ffs ${mntpoint} ${mntpoint}/.snap/snap$i"
 	mksnap_ffs ${mntpoint} ${mntpoint}/.snap/snap$i
@@ -72,6 +72,7 @@ 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
 done