Date: Tue, 7 Jul 2015 07:42:09 +0000 (UTC) From: Peter Holm <pho@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r285239 - user/pho/stress2/misc Message-ID: <201507070742.t677g98g021427@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pho Date: Tue Jul 7 07:42:08 2015 New Revision: 285239 URL: https://svnweb.freebsd.org/changeset/base/285239 Log: Added constant for number of test mount points to cleanup. Added minor improvements to the cleanup. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/cleanup.sh Modified: user/pho/stress2/misc/cleanup.sh ============================================================================== --- user/pho/stress2/misc/cleanup.sh Tue Jul 7 07:28:15 2015 (r285238) +++ user/pho/stress2/misc/cleanup.sh Tue Jul 7 07:42:08 2015 (r285239) @@ -32,21 +32,30 @@ . ../default.cfg -mount | grep -wq $mntpoint && umount -f $mntpoint +MOUNTS=31 +mount | grep -q "on $mntpoint " && umount -f $mntpoint rm -rf ${mntpoint}/stressX* -rm -f /tmp/.snap/pho* /var/.snap/pho* +rm -f /tmp/.snap/stress2* /var/.snap/stress2* rm -rf /tmp/stressX.control $RUNDIR /tmp/misc.name mkdir -p $RUNDIR chmod 0777 $RUNDIR -for i in `jot 16 0 | sort -nr` ""; do - while mount | grep -q "${mntpoint}$i "; do +for i in `jot $MOUNTS 0 | sort -nr` ""; do + while mount | grep -q "on ${mntpoint}$i "; do fstat ${mntpoint}$i | sed 1d | awk '{print $3}' | xargs kill umount -f ${mntpoint}$i > /dev/null 2>&1 done done +# Delete the test mount points /mnt0 .. /mnt31 +for i in `jot $MOUNTS 0`; do + if ! mount | grep -q "on ${mntpoint}$i "; then + [ -d ${mntpoint}$i ] && find ${mntpoint}$i -delete 2>/dev/null + rm -rf ${mntpoint}$i > /dev/null 2>&1 + fi +done +find $mntpoint/* -delete 2>/dev/null m=$mdstart -for i in `jot 15`; do - mdconfig -l | grep -q md$m && mdconfig -d -u $m +for i in `jot $MOUNTS`; do + [ -c /dev/md$m ] && mdconfig -d -u $m m=$((m + 1)) done
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507070742.t677g98g021427>