Date: Mon, 1 May 2017 07:52:22 +0000 (UTC) From: Peter Holm <pho@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r317640 - user/pho/stress2/misc Message-ID: <201705010752.v417qMnR033106@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pho Date: Mon May 1 07:52:22 2017 New Revision: 317640 URL: https://svnweb.freebsd.org/changeset/base/317640 Log: Style and fix test termination. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/nfs5.sh user/pho/stress2/misc/nfs6.sh Modified: user/pho/stress2/misc/nfs5.sh ============================================================================== --- user/pho/stress2/misc/nfs5.sh Mon May 1 07:49:41 2017 (r317639) +++ user/pho/stress2/misc/nfs5.sh Mon May 1 07:52:22 2017 (r317640) @@ -36,22 +36,23 @@ D=$diskimage dede $D 1m 128 || exit mount | grep "${mntpoint}2" | grep nfs > /dev/null && umount -f ${mntpoint}2 -mount | grep "$mntpoint" | grep /md > /dev/null && umount -f ${mntpoint} -mdconfig -l | grep -q ${mdstart} && mdconfig -d -u $mdstart +mount | grep "$mntpoint" | grep /md > /dev/null && umount -f $mntpoint +mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart mdconfig -a -t vnode -f $D -u $mdstart -bsdlabel -w md${mdstart} auto -newfs $newfs_flags md${mdstart}${part} > /dev/null -mount /dev/md${mdstart}${part} $mntpoint +bsdlabel -w md$mdstart auto +newfs $newfs_flags md${mdstart}$part > /dev/null +mount /dev/md${mdstart}$part $mntpoint -mkdir ${mntpoint}/stressX -chmod 777 ${mntpoint}/stressX +mkdir $mntpoint/stressX +chmod 777 $mntpoint/stressX [ ! -d ${mntpoint}2 ] && mkdir ${mntpoint}2 chmod 777 ${mntpoint}2 -mount -t nfs -o tcp -o retrycnt=3 -o intr -o soft -o rw 127.0.0.1:/$mntpoint ${mntpoint}2 +mount -t nfs -o tcp -o retrycnt=3 -o intr,soft -o rw 127.0.0.1:$mntpoint \ + ${mntpoint}2 export RUNDIR=${mntpoint}2/stressX export runRUNTIME=4m @@ -63,5 +64,7 @@ umount -f ${mntpoint}2 > /dev/null 2>&1 mdconfig -d -u $mdstart rm -f $D -kill `ps | grep run.sh | grep -v grep | awk '{print $1}'` +kill $! +../tools/killall.sh wait +exit 0 Modified: user/pho/stress2/misc/nfs6.sh ============================================================================== --- user/pho/stress2/misc/nfs6.sh Mon May 1 07:49:41 2017 (r317639) +++ user/pho/stress2/misc/nfs6.sh Mon May 1 07:52:22 2017 (r317640) @@ -42,22 +42,23 @@ D=$diskimage dede $D 1m 128 || exit mount | grep "${mntpoint}2" | grep nfs > /dev/null && umount -f ${mntpoint}2 -mount | grep "$mntpoint" | grep /md > /dev/null && umount -f ${mntpoint} -mdconfig -l | grep -q ${mdstart} && mdconfig -d -u $mdstart +mount | grep "$mntpoint" | grep /md > /dev/null && umount -f $mntpoint +mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart mdconfig -a -t vnode -f $D -u $mdstart -bsdlabel -w md${mdstart} auto -newfs $newfs_flags md${mdstart}${part} > /dev/null -mount /dev/md${mdstart}${part} $mntpoint +bsdlabel -w md$mdstart auto +newfs $newfs_flags md${mdstart}$part > /dev/null +mount /dev/md${mdstart}$part $mntpoint -mkdir ${mntpoint}/stressX -chmod 777 ${mntpoint}/stressX +mkdir $mntpoint/stressX +chmod 777 $mntpoint/stressX [ ! -d ${mntpoint}2 ] && mkdir ${mntpoint}2 chmod 777 ${mntpoint}2 -mount -t nfs -o tcp -o retrycnt=3 -o intr -o soft -o rw 127.0.0.1:$mntpoint ${mntpoint}2 +mount -t nfs -o tcp -o retrycnt=3 -o intr,soft -o rw 127.0.0.1:$mntpoint \ + ${mntpoint}2 export RUNDIR=${mntpoint}2/stressX export runRUNTIME=4m @@ -67,7 +68,7 @@ sleep 60 for i in `jot 10`; do umount -f $mntpoint > /dev/null 2>&1 sleep 1 - mount /dev/md${mdstart}${part} $mntpoint + mount /dev/md${mdstart}$part $mntpoint sleep 1 done @@ -76,5 +77,7 @@ umount -f ${mntpoint}2 > /dev/null 2>&1 mdconfig -d -u $mdstart rm -f $D -kill `ps | grep run.sh | grep -v grep | awk '{print $1}'` +kill $! +../tools/killall.sh wait +exit 0
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705010752.v417qMnR033106>