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

[Peter Holm]

Author: pho
Date: Tue Dec 10 11:43:18 2013
New Revision: 259165
URL: http://svnweb.freebsd.org/changeset/base/259165

Log:
  Some old improvements to the scenario, from when snapshots were enabled for
  SU+J.
  
  Sponsored by:	EMC / Isilon storage division

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

Modified: user/pho/stress2/misc/suj22.sh
==============================================================================
--- user/pho/stress2/misc/suj22.sh	Tue Dec 10 10:32:18 2013	(r259164)
+++ user/pho/stress2/misc/suj22.sh	Tue Dec 10 11:43:18 2013	(r259165)
@@ -55,10 +55,12 @@
 # }
 
 snap () {
-	while [ ! -s $2 ]; do
+	for i in `jot 5`; do
 		mksnap_ffs $1 $2 2>&1 | grep -v "Resource temporarily unavailable"
-		[ ! -s $2 ] && rm -f $2	# Get rid of zero size snapshots
+		[ ! -s $2 ] && rm -f $2	|| return 0
+		sleep 1
 	done
+	return 1
 }
 
 D=$diskimage
@@ -97,7 +99,7 @@ snap $mntpoint ${mntpoint}/.snap/snap2
 for i in `jot 10`; do
 	/tmp/suj22 prune
 	/tmp/suj22
-	snap $mntpoint ${mntpoint}/.snap/snap$((i + 2))
+	snap $mntpoint ${mntpoint}/.snap/snap$((i + 2)) || break
 	sn=`ls -tU ${mntpoint}/.snap | tail -1`
 	rm -f ${mntpoint}/.snap/$sn
 done
@@ -106,8 +108,10 @@ cd $here
 while mount | grep -q ${mntpoint}; do
 	umount ${mntpoint} || sleep 1
 done
+fsck -t ufs -y md${mdstart}${part}
+fsck -t ufs -y md${mdstart}${part}
 mdconfig -d -u ${mdstart}
-rm -f /tmp/suj22
+rm -f /tmp/suj22 $D
 exit 0
 EOF
 #include <sys/types.h>