Date: Mon, 24 Oct 2016 07:54:55 +0000 (UTC) From: Peter Holm <pho@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r307849 - user/pho/stress2/misc Message-ID: <201610240754.u9O7std5008946@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pho Date: Mon Oct 24 07:54:55 2016 New Revision: 307849 URL: https://svnweb.freebsd.org/changeset/base/307849 Log: Style fix. Added missing cleanup on error exit. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/umountf5.sh Modified: user/pho/stress2/misc/umountf5.sh ============================================================================== --- user/pho/stress2/misc/umountf5.sh Mon Oct 24 07:52:04 2016 (r307848) +++ user/pho/stress2/misc/umountf5.sh Mon Oct 24 07:54:55 2016 (r307849) @@ -38,10 +38,11 @@ D=$diskimage dd if=/dev/zero of=$D$m bs=1m count=10 2>&1 | egrep -v "records|transferred" -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} +mdconfig -a -t vnode -f $D -u $mdstart || { rm -f $diskimage; exit 1; } bsdlabel -w md${mdstart} auto newfs $newfs_flags md${mdstart}$part > /dev/null 2>&1 mount /dev/md${mdstart}$part $mntpoint @@ -49,7 +50,6 @@ mount /dev/md${mdstart}$part $mntpoint export RUNDIR=$mntpoint/stressX export runRUNTIME=2m cd ..; ./run.sh vfs.cfg > /dev/null 2>&1 & -pid=$! sleep 30 @@ -57,7 +57,8 @@ umount -f $mntpoint mdconfig -d -u $mdstart rm -f $D -while ps | egrep "testcases|swap|mkdir|creat" | grep -vq grep; do - ps | egrep "testcases|swap|mkdir|creat" | grep -v grep | awk '{print $1}' | xargs kill +while pkill -f "swap|mkdir|creat"; do sleep 1 done +wait +exit 0
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610240754.u9O7std5008946>