Date: Sat, 12 Mar 2016 17:05:24 +0000 (UTC) From: Peter Holm <pho@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r296725 - user/pho/stress2/misc Message-ID: <201603121705.u2CH5O0V033438@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pho Date: Sat Mar 12 17:05:24 2016 New Revision: 296725 URL: https://svnweb.freebsd.org/changeset/base/296725 Log: Added missing "wait" to scripts using background commands. Sponsored by: EMC / Isilon Storage Division Modified: user/pho/stress2/misc/core2.sh user/pho/stress2/misc/dangling.sh user/pho/stress2/misc/fts.sh user/pho/stress2/misc/kevent4.sh user/pho/stress2/misc/machipc.sh user/pho/stress2/misc/mlockall4.sh user/pho/stress2/misc/mountro.sh user/pho/stress2/misc/nfs3.sh user/pho/stress2/misc/nfs4.sh user/pho/stress2/misc/nfs5.sh user/pho/stress2/misc/nfs6.sh user/pho/stress2/misc/nfs9.sh user/pho/stress2/misc/quota11.sh user/pho/stress2/misc/quota6.sh user/pho/stress2/misc/sendfile2.sh user/pho/stress2/misc/sendfile6.sh user/pho/stress2/misc/signal0.sh user/pho/stress2/misc/sigxcpu.sh user/pho/stress2/misc/snap2-1.sh user/pho/stress2/misc/snap2.sh user/pho/stress2/misc/snap7.sh user/pho/stress2/misc/tmpfs7.sh user/pho/stress2/misc/ucom.sh user/pho/stress2/misc/zfs6.sh Modified: user/pho/stress2/misc/core2.sh ============================================================================== --- user/pho/stress2/misc/core2.sh Sat Mar 12 15:10:30 2016 (r296724) +++ user/pho/stress2/misc/core2.sh Sat Mar 12 17:05:24 2016 (r296725) @@ -58,6 +58,7 @@ for i in `jot 60`; do umount $mntpoint 2>/dev/null || sleep 1 mount | grep -q "on $mntpoint " || break done +wait mount | grep -q "on $mntpoint " && umount -f $mntpoint mdconfig -d -u $mdstart Modified: user/pho/stress2/misc/dangling.sh ============================================================================== --- user/pho/stress2/misc/dangling.sh Sat Mar 12 15:10:30 2016 (r296724) +++ user/pho/stress2/misc/dangling.sh Sat Mar 12 17:05:24 2016 (r296725) @@ -77,6 +77,7 @@ for i in `jot 10`; do kill $! ../tools/killall.sh > /dev/null 2>&1 ../tools/killall.sh > /dev/null 2>&1 + wait done while mount | grep $mntpoint | grep -q /dev/md; do Modified: user/pho/stress2/misc/fts.sh ============================================================================== --- user/pho/stress2/misc/fts.sh Sat Mar 12 15:10:30 2016 (r296724) +++ user/pho/stress2/misc/fts.sh Sat Mar 12 17:05:24 2016 (r296725) @@ -62,6 +62,7 @@ while kill -0 $pid 2> /dev/null; do /tmp/fts $mntpoint sleep 1 done +wait while mount | grep $mntpoint | grep -q /dev/md; do umount $mntpoint || sleep 1 Modified: user/pho/stress2/misc/kevent4.sh ============================================================================== --- user/pho/stress2/misc/kevent4.sh Sat Mar 12 15:10:30 2016 (r296724) +++ user/pho/stress2/misc/kevent4.sh Sat Mar 12 17:05:24 2016 (r296725) @@ -49,6 +49,7 @@ sleep 120 kill $rpid ../tools/killall.sh > /dev/null 2>&1 kill $! +wait rm -f /tmp/kevent4 exit Modified: user/pho/stress2/misc/machipc.sh ============================================================================== --- user/pho/stress2/misc/machipc.sh Sat Mar 12 15:10:30 2016 (r296724) +++ user/pho/stress2/misc/machipc.sh Sat Mar 12 17:05:24 2016 (r296725) @@ -44,6 +44,7 @@ cd $odir sleep 5 /tmp/machipc pkill swap +wait rm -f /tmp/machipc exit 0 EOF Modified: user/pho/stress2/misc/mlockall4.sh ============================================================================== --- user/pho/stress2/misc/mlockall4.sh Sat Mar 12 15:10:30 2016 (r296724) +++ user/pho/stress2/misc/mlockall4.sh Sat Mar 12 17:05:24 2016 (r296725) @@ -48,6 +48,7 @@ mount -t nullfs /tmp $mntpoint sleep 2 umount -f $mntpoint +wait rm -f /tmp/mlockall4 exit EOF Modified: user/pho/stress2/misc/mountro.sh ============================================================================== --- user/pho/stress2/misc/mountro.sh Sat Mar 12 15:10:30 2016 (r296724) +++ user/pho/stress2/misc/mountro.sh Sat Mar 12 17:05:24 2016 (r296725) @@ -65,3 +65,4 @@ umount -f $mntpoint > /dev/null 2>&1 mdconfig -d -u $mdstart rm -f $D kill `ps | grep run.sh | grep -v grep | awk '{print $1}'` +wait Modified: user/pho/stress2/misc/nfs3.sh ============================================================================== --- user/pho/stress2/misc/nfs3.sh Sat Mar 12 15:10:30 2016 (r296724) +++ user/pho/stress2/misc/nfs3.sh Sat Mar 12 17:05:24 2016 (r296725) @@ -58,3 +58,4 @@ while mount | grep -q "on $mntpoint "; d done kill -9 $! ../tools/killall.sh +wait Modified: user/pho/stress2/misc/nfs4.sh ============================================================================== --- user/pho/stress2/misc/nfs4.sh Sat Mar 12 15:10:30 2016 (r296724) +++ user/pho/stress2/misc/nfs4.sh Sat Mar 12 17:05:24 2016 (r296725) @@ -57,3 +57,4 @@ while mount | grep -q $mntpoint; do done kill -9 $! ../tools/killall.sh +wait Modified: user/pho/stress2/misc/nfs5.sh ============================================================================== --- user/pho/stress2/misc/nfs5.sh Sat Mar 12 15:10:30 2016 (r296724) +++ user/pho/stress2/misc/nfs5.sh Sat Mar 12 17:05:24 2016 (r296725) @@ -64,3 +64,4 @@ 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}'` +wait Modified: user/pho/stress2/misc/nfs6.sh ============================================================================== --- user/pho/stress2/misc/nfs6.sh Sat Mar 12 15:10:30 2016 (r296724) +++ user/pho/stress2/misc/nfs6.sh Sat Mar 12 17:05:24 2016 (r296725) @@ -77,3 +77,4 @@ 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}'` +wait Modified: user/pho/stress2/misc/nfs9.sh ============================================================================== --- user/pho/stress2/misc/nfs9.sh Sat Mar 12 15:10:30 2016 (r296724) +++ user/pho/stress2/misc/nfs9.sh Sat Mar 12 17:05:24 2016 (r296725) @@ -64,6 +64,7 @@ for i in `jot 10`; do umount -f $mntpoint > /dev/null 2>&1 done kill -9 $! + wait done ../tools/killall.sh rm -rf /tmp/nfs9 Modified: user/pho/stress2/misc/quota11.sh ============================================================================== --- user/pho/stress2/misc/quota11.sh Sat Mar 12 15:10:30 2016 (r296724) +++ user/pho/stress2/misc/quota11.sh Sat Mar 12 17:05:24 2016 (r296725) @@ -56,6 +56,7 @@ while true; do repquota -av > /dev/null; dd if=/dev/random of=$mntpoint/foo.data bs=512 count=1024x1024 2>&1 | egrep -v "trans|record" kill $! +wait while mount | grep "on $mntpoint " | grep -q /dev/md; do umount $mntpoint || sleep 1 Modified: user/pho/stress2/misc/quota6.sh ============================================================================== --- user/pho/stress2/misc/quota6.sh Sat Mar 12 15:10:30 2016 (r296724) +++ user/pho/stress2/misc/quota6.sh Sat Mar 12 17:05:24 2016 (r296725) @@ -59,6 +59,7 @@ for i in `jot 5`; do rm -f $mntpoint/.snap/snap1 done kill $pid +wait while mount | grep -q ${mntpoint}; do umount ${mntpoint} || sleep 1 done Modified: user/pho/stress2/misc/sendfile2.sh ============================================================================== --- user/pho/stress2/misc/sendfile2.sh Sat Mar 12 15:10:30 2016 (r296724) +++ user/pho/stress2/misc/sendfile2.sh Sat Mar 12 17:05:24 2016 (r296725) @@ -51,6 +51,7 @@ nc -l 7000 > lf & sleep 0.1 /tmp/sendfile2 kill $! 2>/dev/null +wait md2=`md5 large` [ "$md1" != "$md2" ] && printf "%s\n%s\n" "$md1" "$md2" Modified: user/pho/stress2/misc/sendfile6.sh ============================================================================== --- user/pho/stress2/misc/sendfile6.sh Sat Mar 12 15:10:30 2016 (r296724) +++ user/pho/stress2/misc/sendfile6.sh Sat Mar 12 17:05:24 2016 (r296725) @@ -246,6 +246,7 @@ dd if=/dev/random of=$mntpoint/data bs=1 ./sendfile6_server $mntpoint/data mysocket & sleep 0.2 ./sendfile6_client mysocket > data.$$ +wait cmp $mntpoint/data data.$$ || { echo "FAIL Data mismatch"; ls -l $mntpoint/data data.$$; } rm -f data.$$ sendfile6_server sendfile6_client mysocket Modified: user/pho/stress2/misc/signal0.sh ============================================================================== --- user/pho/stress2/misc/signal0.sh Sat Mar 12 15:10:30 2016 (r296724) +++ user/pho/stress2/misc/signal0.sh Sat Mar 12 17:05:24 2016 (r296725) @@ -53,6 +53,7 @@ done while pkill -9 swap; do : done +wait rm -f /tmp/signal0 exit Modified: user/pho/stress2/misc/sigxcpu.sh ============================================================================== --- user/pho/stress2/misc/sigxcpu.sh Sat Mar 12 15:10:30 2016 (r296724) +++ user/pho/stress2/misc/sigxcpu.sh Sat Mar 12 17:05:24 2016 (r296725) @@ -67,6 +67,7 @@ done kill $! ../tools/killall.sh ../tools/killall.sh +wait while mount | grep $mntpoint | grep -q /dev/md; do umount $mntpoint || sleep 1 Modified: user/pho/stress2/misc/snap2-1.sh ============================================================================== --- user/pho/stress2/misc/snap2-1.sh Sat Mar 12 15:10:30 2016 (r296724) +++ user/pho/stress2/misc/snap2-1.sh Sat Mar 12 17:05:24 2016 (r296725) @@ -59,3 +59,4 @@ mdconfig -d -u $mdstart > /dev/null 2>&1 umount -f $mntpoint mdconfig -d -u $mdstart rm -f /tmp/.snap/stress2 +wait Modified: user/pho/stress2/misc/snap2.sh ============================================================================== --- user/pho/stress2/misc/snap2.sh Sat Mar 12 15:10:30 2016 (r296724) +++ user/pho/stress2/misc/snap2.sh Sat Mar 12 17:05:24 2016 (r296725) @@ -59,3 +59,4 @@ umount ${mntpoint} > /dev/null 2>&1 umount -f ${mntpoint} > /dev/null 2>&1 mdconfig -d -u $mdstart rm -f /tmp/.snap/stress2 +wait Modified: user/pho/stress2/misc/snap7.sh ============================================================================== --- user/pho/stress2/misc/snap7.sh Sat Mar 12 15:10:30 2016 (r296724) +++ user/pho/stress2/misc/snap7.sh Sat Mar 12 17:05:24 2016 (r296725) @@ -52,6 +52,7 @@ while [ `date '+%s'` -lt $((start + 1200 umount $mntpoint 2>/dev/null done kill $! + wait while mount | grep -q "/dev/md$mdstart on $mntpoint"; do umount $mntpoint 2>/dev/null done Modified: user/pho/stress2/misc/tmpfs7.sh ============================================================================== --- user/pho/stress2/misc/tmpfs7.sh Sat Mar 12 15:10:30 2016 (r296724) +++ user/pho/stress2/misc/tmpfs7.sh Sat Mar 12 17:05:24 2016 (r296725) @@ -245,6 +245,7 @@ cmp $mntpoint/data data.$$ || { echo "FAIL Data mismatch"; ls -l $mntpoint/data data.$$; } rm -f data.$$ server client mysocket +wait while mount | grep "$mntpoint" | grep -q tmpfs; do umount $mntpoint || sleep 1 done Modified: user/pho/stress2/misc/ucom.sh ============================================================================== --- user/pho/stress2/misc/ucom.sh Sat Mar 12 15:10:30 2016 (r296724) +++ user/pho/stress2/misc/ucom.sh Sat Mar 12 17:05:24 2016 (r296725) @@ -69,3 +69,4 @@ tst "tail -F /dev/ttyU0" tst "tail /dev/ttyU0" [ ! -z "$pid" ] && kill $pid +wait Modified: user/pho/stress2/misc/zfs6.sh ============================================================================== --- user/pho/stress2/misc/zfs6.sh Sat Mar 12 15:10:30 2016 (r296724) +++ user/pho/stress2/misc/zfs6.sh Sat Mar 12 17:05:24 2016 (r296725) @@ -66,6 +66,7 @@ for i in `jot 5000`; do fi done kill $! +wait zfs destroy -r tank zpool destroy tank
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603121705.u2CH5O0V033438>