Date: Mon, 10 Oct 2016 08:46:26 +0000 (UTC) From: Peter Holm <pho@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r306943 - user/pho/stress2/misc Message-ID: <201610100846.u9A8kQtt079523@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pho Date: Mon Oct 10 08:46:26 2016 New Revision: 306943 URL: https://svnweb.freebsd.org/changeset/base/306943 Log: Exit tests if mdconfig(8) fail. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/mount2.sh user/pho/stress2/misc/mountro.sh user/pho/stress2/misc/mountro2.sh user/pho/stress2/misc/mountro3.sh user/pho/stress2/misc/newfs3.sh user/pho/stress2/misc/umountf4.sh user/pho/stress2/misc/umountf6.sh Modified: user/pho/stress2/misc/mount2.sh ============================================================================== --- user/pho/stress2/misc/mount2.sh Mon Oct 10 07:19:16 2016 (r306942) +++ user/pho/stress2/misc/mount2.sh Mon Oct 10 08:46:26 2016 (r306943) @@ -42,11 +42,12 @@ if [ $# -eq 0 ]; then for i in `jot $mounts`; do m=$(( i + mdstart - 1 )) [ ! -d ${mntpoint}$m ] && mkdir ${mntpoint}$m - mount | grep "${mntpoint}" | grep -q md$m && umount ${mntpoint}$m + mount | grep "${mntpoint}" | grep -q md$m && + umount ${mntpoint}$m mdconfig -l | grep -q md$m && mdconfig -d -u $m dd if=/dev/zero of=$D$m bs=1m count=1 > /dev/null 2>&1 - mdconfig -a -t vnode -f $D$m -u $m + mdconfig -a -t vnode -f $D$m -u $m || { rm -f $D$m; exit 1; } bsdlabel -w md$m auto newfs md${m}${part} > /dev/null 2>&1 done Modified: user/pho/stress2/misc/mountro.sh ============================================================================== --- user/pho/stress2/misc/mountro.sh Mon Oct 10 07:19:16 2016 (r306942) +++ user/pho/stress2/misc/mountro.sh Mon Oct 10 08:46:26 2016 (r306943) @@ -39,7 +39,7 @@ dede $D 1m 128 || exit mount | grep "$mntpoint" | grep -q /md && umount -f ${mntpoint} mdconfig -l | grep -q ${mdstart} && mdconfig -d -u $mdstart -mdconfig -a -t vnode -f $D -u $mdstart +mdconfig -a -t vnode -f $D -u $mdstart || { rm -f $D; exit 1; } bsdlabel -w md${mdstart} auto newfs $newfs_flags md${mdstart}${part} > /dev/null 2>&1 Modified: user/pho/stress2/misc/mountro2.sh ============================================================================== --- user/pho/stress2/misc/mountro2.sh Mon Oct 10 07:19:16 2016 (r306942) +++ user/pho/stress2/misc/mountro2.sh Mon Oct 10 08:46:26 2016 (r306943) @@ -41,7 +41,7 @@ dede $D 1m 20 || exit mount | grep "$mntpoint" | grep -q /md && umount -f ${mntpoint} mdconfig -l | grep -q ${mdstart} && mdconfig -d -u $mdstart -mdconfig -a -t vnode -f $D -u $mdstart +mdconfig -a -t vnode -f $D -u $mdstart || { rm -f $D; exit 1; } bsdlabel -w md${mdstart} auto newfs $newfs_flags md${mdstart}${part} > /dev/null 2>&1 Modified: user/pho/stress2/misc/mountro3.sh ============================================================================== --- user/pho/stress2/misc/mountro3.sh Mon Oct 10 07:19:16 2016 (r306942) +++ user/pho/stress2/misc/mountro3.sh Mon Oct 10 08:46:26 2016 (r306943) @@ -41,7 +41,7 @@ dede $D 1m 64 || exit 1 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 $D; exit 1; } bsdlabel -w md${mdstart} auto newfs $newfs_flags md${mdstart}${part} > /dev/null 2>&1 Modified: user/pho/stress2/misc/newfs3.sh ============================================================================== --- user/pho/stress2/misc/newfs3.sh Mon Oct 10 07:19:16 2016 (r306942) +++ user/pho/stress2/misc/newfs3.sh Mon Oct 10 08:46:26 2016 (r306943) @@ -51,7 +51,8 @@ while [ $size -le $((128 * 1024 * 1024)) rm -f $diskimage dd if=/dev/zero of=$diskimage bs=1m count=$mb 2>&1 | egrep -v "records|transferred" - mdconfig -a -t vnode -f $diskimage -u $mdstart + mdconfig -a -t vnode -f $diskimage -u $mdstart || + { rm -f $diskimage; exit 1; } bsdlabel -w md$mdstart auto blocksize=4096 while [ $blocksize -le 65536 ]; do Modified: user/pho/stress2/misc/umountf4.sh ============================================================================== --- user/pho/stress2/misc/umountf4.sh Mon Oct 10 07:19:16 2016 (r306942) +++ user/pho/stress2/misc/umountf4.sh Mon Oct 10 08:46:26 2016 (r306943) @@ -46,7 +46,8 @@ if [ $# -eq 0 ]; then mdconfig -l | grep -q md$m && mdconfig -d -u $m dede $D$m 1m 10 - mdconfig -a -t vnode -f $D$m -u $m + mdconfig -a -t vnode -f $D$m -u $m || + { rm -f $D$m; exit 1; } bsdlabel -w md$m auto newfs md${m}${part} > /dev/null 2>&1 done Modified: user/pho/stress2/misc/umountf6.sh ============================================================================== --- user/pho/stress2/misc/umountf6.sh Mon Oct 10 07:19:16 2016 (r306942) +++ user/pho/stress2/misc/umountf6.sh Mon Oct 10 08:46:26 2016 (r306943) @@ -48,7 +48,8 @@ if [ $# -eq 0 ]; then dede $D$m 1m 10 dd if=/dev/zero of=$D$m bs=1m count=10 2>&1 | egrep -v "records|transferred" - mdconfig -a -t vnode -f $D$m -u $m + mdconfig -a -t vnode -f $D$m -u $m || + { rm -f $D$m; exit 1; } bsdlabel -w md$m auto newfs $newfs_flags md${m}$part > /dev/null 2>&1 done
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610100846.u9A8kQtt079523>