svn commit: r286115 - user/pho/stress2/misc

[Peter Holm]

Author: pho
Date: Fri Jul 31 09:08:06 2015
New Revision: 286115
URL: https://svnweb.freebsd.org/changeset/base/286115

Log:
  Reduce runtime and handle umount(1) failure.
  
  Sponsored by:	EMC / Isilon storage division

Modified:
  user/pho/stress2/misc/snap7.sh

Modified: user/pho/stress2/misc/snap7.sh
==============================================================================
--- user/pho/stress2/misc/snap7.sh	Fri Jul 31 09:04:22 2015	(r286114)
+++ user/pho/stress2/misc/snap7.sh	Fri Jul 31 09:08:06 2015	(r286115)
@@ -43,7 +43,7 @@ mount | grep "$mntpoint" | grep -q md$md
 mdconfig -l | grep -q md$mdstart &&  mdconfig -d -u $mdstart
 
 start=`date '+%s'`
-while [ `date '+%s'` -lt $((start + 1800)) ]; do
+while [ `date '+%s'` -lt $((start + 1200)) ]; do
    mksnap_ffs /tmp /tmp/.snap/stress2.1
    mdconfig -a -t vnode -f /tmp/.snap/stress2.1 -u $mdstart -o readonly
    sh -c "while true; do ls $mntpoint > /dev/null;done" &
@@ -52,6 +52,9 @@ while [ `date '+%s'` -lt $((start + 1800
       umount $mntpoint 2>/dev/null
    done
    kill $!
+   while mount | grep -q "/dev/md$mdstart on $mntpoint"; do
+      umount $mntpoint 2>/dev/null
+   done
    mdconfig -d -u $mdstart
    rm -f /tmp/.snap/stress2.1
 done