Date: Fri, 12 May 2017 08:32:26 +0000 (UTC) From: Peter Holm <pho@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r318233 - user/pho/stress2/misc Message-ID: <201705120832.v4C8WQSo022204@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pho Date: Fri May 12 08:32:26 2017 New Revision: 318233 URL: https://svnweb.freebsd.org/changeset/base/318233 Log: Style. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/graid1_4.sh user/pho/stress2/misc/graid1_6.sh user/pho/stress2/misc/nanosleep.sh user/pho/stress2/misc/nfs11.sh user/pho/stress2/misc/nullfs15.sh user/pho/stress2/misc/spin.sh user/pho/stress2/misc/vunref.sh Modified: user/pho/stress2/misc/graid1_4.sh ============================================================================== --- user/pho/stress2/misc/graid1_4.sh Fri May 12 06:35:20 2017 (r318232) +++ user/pho/stress2/misc/graid1_4.sh Fri May 12 08:32:26 2017 (r318233) @@ -38,7 +38,7 @@ . ../default.cfg -rm -f ${diskimage}* +rm -f $diskimage* need=1024 # MB [ `df -k $(dirname $diskimage) | tail -1 | awk '{print int($4 / 1024)'}` -lt \ $need ] && printf "Need %d MB on %s.\n" $need `dirname $diskimage` && exit Modified: user/pho/stress2/misc/graid1_6.sh ============================================================================== --- user/pho/stress2/misc/graid1_6.sh Fri May 12 06:35:20 2017 (r318232) +++ user/pho/stress2/misc/graid1_6.sh Fri May 12 08:32:26 2017 (r318233) @@ -34,7 +34,7 @@ . ../default.cfg -rm -f ${diskimage}* +rm -f $diskimage* need=1024 # MB [ `df -k $(dirname $diskimage) | tail -1 | awk '{print int($4 / 1024)'}` -lt \ $need ] && printf "Need %d MB on %s.\n" $need `dirname $diskimage` && exit Modified: user/pho/stress2/misc/nanosleep.sh ============================================================================== --- user/pho/stress2/misc/nanosleep.sh Fri May 12 06:35:20 2017 (r318232) +++ user/pho/stress2/misc/nanosleep.sh Fri May 12 08:32:26 2017 (r318233) @@ -30,7 +30,7 @@ # A simplistic regression test for r200510: -[ `sysctl kern.hz | sed 's/.* //'` -ne 1000 ] && exit 1 +[ `sysctl -n kern.hz` -lt 1000 ] && exit 0 . ../default.cfg Modified: user/pho/stress2/misc/nfs11.sh ============================================================================== --- user/pho/stress2/misc/nfs11.sh Fri May 12 06:35:20 2017 (r318232) +++ user/pho/stress2/misc/nfs11.sh Fri May 12 08:32:26 2017 (r318233) @@ -66,3 +66,4 @@ while mount | grep "on $mntpoint " | gre umount $mntpoint || sleep 1 done mdconfig -d -u $mdstart +exit 0 Modified: user/pho/stress2/misc/nullfs15.sh ============================================================================== --- user/pho/stress2/misc/nullfs15.sh Fri May 12 06:35:20 2017 (r318232) +++ user/pho/stress2/misc/nullfs15.sh Fri May 12 08:32:26 2017 (r318233) @@ -47,13 +47,13 @@ newfs $newfs_flags md${mdstart}$part > / mount /dev/md${mdstart}$part $mntpoint mount -t nullfs $mntpoint $nullfsmp -mkdir ${mntpoint}/.new_packages ${nullfsmp}/new_packages -mount -t nullfs ${mntpoint}/.new_packages ${nullfsmp}/new_packages -dd if=/dev/zero of=${nullfsmp}/new_packages/bar count=20000 2>&1 | +mkdir $mntpoint/.new_packages $nullfsmp/new_packages +mount -t nullfs $mntpoint/.new_packages $nullfsmp/new_packages +dd if=/dev/zero of=$nullfsmp/new_packages/bar count=20000 2>&1 | egrep -v "records|transferred" -mv ${mntpoint}/.new_packages/bar /tmp/ -rm -rf ${mntpoint}/.new_packages -umount -f ${nullfsmp}/new_packages +mv $mntpoint/.new_packages/bar /tmp/ +rm -rf $mntpoint/.new_packages +umount -f $nullfsmp/new_packages while mount | grep -q "$nullfsmp "; do umount $nullfsmp || sleep 1 Modified: user/pho/stress2/misc/spin.sh ============================================================================== --- user/pho/stress2/misc/spin.sh Fri May 12 06:35:20 2017 (r318232) +++ user/pho/stress2/misc/spin.sh Fri May 12 08:32:26 2017 (r318233) @@ -63,8 +63,7 @@ error=0 n=0 while kill -0 $! 2>/dev/null; do sleep 1 - n=$((n + 1)) - if [ $n -gt $timeout ]; then + if [ $((n += 1)) -gt $timeout ]; then echo FAIL ps -l | grep -v sed | sed -n '1p;/ufs/p' pkill spin Modified: user/pho/stress2/misc/vunref.sh ============================================================================== --- user/pho/stress2/misc/vunref.sh Fri May 12 06:35:20 2017 (r318232) +++ user/pho/stress2/misc/vunref.sh Fri May 12 08:32:26 2017 (r318233) @@ -103,8 +103,7 @@ else n=0 while mount | grep -qw $mntpoint$m; do umount ${mntpoint}$m > /dev/null 2>&1 && n=0 - n=$((n + 1)) - if [ $n -gt 600 ]; then + if [ $((n += 1)) -gt 600 ]; then echo "*** Leak detected ***" fstat $mntpoint$m rm -f $RUNDIR/active.*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705120832.v4C8WQSo022204>