Date: Wed, 4 Apr 2018 09:05:48 +0000 (UTC) From: Peter Holm <pho@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r332000 - user/pho/stress2/misc Message-ID: <201804040905.w3495mb0066267@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pho Date: Wed Apr 4 09:05:48 2018 New Revision: 332000 URL: https://svnweb.freebsd.org/changeset/base/332000 Log: Do not loop forever on umount(8) failure. Fix exit status calculation. Modified: user/pho/stress2/misc/trim3.sh Modified: user/pho/stress2/misc/trim3.sh ============================================================================== --- user/pho/stress2/misc/trim3.sh Wed Apr 4 09:02:40 2018 (r331999) +++ user/pho/stress2/misc/trim3.sh Wed Apr 4 09:05:48 2018 (r332000) @@ -42,6 +42,7 @@ size="1g" [ $# -eq 0 ] && trim=-t n=0 opt="" +s=0 [ "$newfs_flags" = "-U" ] && opt="-U -j" for flag in ' ' $opt; do echo "mdconfig -a -t swap -s $size -u $mdstart" @@ -59,10 +60,13 @@ for flag in ' ' $opt; do su $testuser -c 'cd ..; ./run.sh marcus.cfg' > /dev/null 2>&1 - while mount | grep $mntpoint | grep -q /dev/md; do - umount $mntpoint || sleep 1 + for i in `jot 6`; do + mount | grep -q "on $mntpoint " || break + umount $mntpoint && break || sleep 10 + [ $i -eq 6 ] && + { echo FATAL; fstat -mf $mntpoint; exit 1; } done - checkfs /dev/md${mdstart}$part; s=$? + checkfs /dev/md${mdstart}$part || s=$? mdconfig -d -u $mdstart done exit $s
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804040905.w3495mb0066267>