From owner-svn-src-user@FreeBSD.ORG Thu Dec 5 11:48:51 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0C5213C5; Thu, 5 Dec 2013 11:48:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id ED22A15B3; Thu, 5 Dec 2013 11:48:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB5BmovA094339; Thu, 5 Dec 2013 11:48:50 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB5Bmo1O094338; Thu, 5 Dec 2013 11:48:50 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <201312051148.rB5Bmo1O094338@svn.freebsd.org> From: Peter Holm Date: Thu, 5 Dec 2013 11:48:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258978 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Dec 2013 11:48:51 -0000 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