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

[Peter Holm]

Author: pho
Date: Mon Oct 12 10:40:59 2015
New Revision: 289181
URL: https://svnweb.freebsd.org/changeset/base/289181

Log:
  Change runtime for tests, cleanup scripts and limit output.
  
  Sponsored by:	EMC / Isilon storage division

Modified:
  user/pho/stress2/misc/newfs.sh
  user/pho/stress2/misc/newfs2.sh
  user/pho/stress2/misc/newfs3.sh

Modified: user/pho/stress2/misc/newfs.sh
==============================================================================
--- user/pho/stress2/misc/newfs.sh	Mon Oct 12 09:53:55 2015	(r289180)
+++ user/pho/stress2/misc/newfs.sh	Mon Oct 12 10:40:59 2015	(r289181)
@@ -32,24 +32,30 @@
 
 . ../default.cfg
 
-mount | grep "$mntpoint" | grep md${mdstart}$part > /dev/null && umount $mntpoint
+mount | grep "$mntpoint" | grep md${mdstart}$part > /dev/null &&
+    umount $mntpoint
 mdconfig -l | grep md$mdstart > /dev/null &&  mdconfig -d -u $mdstart
 
 mdconfig -a -t swap -s 1g -u $mdstart
 bsdlabel -w md$mdstart auto
 
+echo "Expect warnings from SU and SU+J."
 for opt in -O1 -O2 -U -j; do
+	echo "Testing newfs with option $opt."
 	blocksize=4096
 	while [ $blocksize -le 65536 ]; do
 		for i in 8 4 2 1; do
 			fragsize=$((blocksize / i))
-			echo "`date '+%T'` newfs $opt -b $blocksize -f $fragsize md${mdstart}${part}"
-			newfs $opt -b $blocksize -f $fragsize  md${mdstart}$part > /dev/null
+			newfs $opt -b $blocksize -f $fragsize \
+			    md${mdstart}$part > /dev/null 2>&1 || continue
 			mount /dev/md${mdstart}$part $mntpoint
 			export RUNDIR=$mntpoint/stressX
-			export runRUNTIME=4m
+			export runRUNTIME=15s
+			export RUNTIME=$runRUNTIME
+			export CTRLDIR=$mntpoint/stressX.control
 			(cd ..; ./run.sh disk.cfg > /dev/null 2>&1)
-			while mount | grep "$mntpoint" | grep -q md${mdstart}$part; do
+			while mount | grep "$mntpoint" | \
+			    grep -q md${mdstart}$part; do
 				umount $mntpoint > /dev/null 2>&1 || sleep 1
 			done
 		done

Modified: user/pho/stress2/misc/newfs2.sh
==============================================================================
--- user/pho/stress2/misc/newfs2.sh	Mon Oct 12 09:53:55 2015	(r289180)
+++ user/pho/stress2/misc/newfs2.sh	Mon Oct 12 10:40:59 2015	(r289181)
@@ -28,7 +28,7 @@
 # $FreeBSD$
 #
 
-# phk has seen freezes with this newfs option: "-b 32768 -f  4096 -O2"
+# phk has seen freezes with this newfs option: "-b 32768 -f 4096 -O2"
 
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 
@@ -36,24 +36,27 @@
 
 size=$((32 * 1024 * 1024))
 
-mount | grep "$mntpoint" | grep md${mdstart}${part} > /dev/null && umount $mntpoint
-mdconfig -l | grep md${mdstart} > /dev/null &&  mdconfig -d -u ${mdstart}
+mount | grep "$mntpoint" | grep -q md${mdstart}$part && umount $mntpoint
+[ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart
 
 while [ $size -le $((900 * 1024 * 1024)) ]; do
-	echo "Testing with $((size / 1024 / 1024)) Mb"
-	truncate -s $size $diskimage
-	mdconfig -a -t vnode -f $diskimage -u ${mdstart}
-	disklabel -r -w md${mdstart} auto
-	newfs -b 32768 -f  4096 -O2    md${mdstart}${part} > /dev/null 2>&1
-	mount /dev/md${mdstart}${part} $mntpoint
-	df -i $mntpoint
+	mb=$((size / 1024 / 1024))
+	rm -f $diskimage
+	dd if=/dev/zero of=$diskimage bs=1m count=$mb 2>&1 |
+	    egrep -v "records|transferred"
+	mdconfig -a -t vnode -f $diskimage -u $mdstart
+	bsdlabel -w md$mdstart auto
+	newfs -b 32768 -f 4096 -O2 md${mdstart}$part > /dev/null 2>&1
+	mount /dev/md${mdstart}$part $mntpoint
 	export RUNDIR=$mntpoint/stressX
-	export runRUNTIME=10m            # Run tests for 10 minutes
-	(cd ..; ./run.sh disk.cfg) 
-	while mount | grep "$mntpoint" | grep -q md${mdstart}${part}; do
+	export runRUNTIME=30s
+	export RUNTIME=$runRUNTIME
+	export CTRLDIR=$mntpoint/stressX.control
+	(cd ..; ./run.sh disk.cfg) > /dev/null
+	while mount | grep "$mntpoint" | grep -q md${mdstart}$part; do
 		umount $mntpoint > /dev/null 2>&1
 	done
-	mdconfig -d -u ${mdstart}
+	mdconfig -d -u $mdstart
 	size=$((size + 32 * 1024 * 1024))
 done
 rm -f $diskimage

Modified: user/pho/stress2/misc/newfs3.sh
==============================================================================
--- user/pho/stress2/misc/newfs3.sh	Mon Oct 12 09:53:55 2015	(r289180)
+++ user/pho/stress2/misc/newfs3.sh	Mon Oct 12 10:40:59 2015	(r289181)
@@ -43,24 +43,30 @@
 size=$((32 * 1024 * 1024))
 opt="-O2"	# newfs option. Eg. -U
 
-mount | grep "$mntpoint" | grep md${mdstart}${part} > /dev/null && umount $mntpoint
-mdconfig -l | grep md${mdstart} > /dev/null &&  mdconfig -d -u ${mdstart}
+mount | grep "$mntpoint" | grep -q md${mdstart}$part && umount $mntpoint
+[ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart
 
 while [ $size -le $((128 * 1024 * 1024)) ]; do
-	truncate -s $size $diskimage
-	mdconfig -a -t vnode -f $diskimage -u ${mdstart}
-	disklabel -r -w md${mdstart} auto
+	mb=$((size / 1024 / 1024))
+	rm -f $diskimage
+	dd if=/dev/zero of=$diskimage bs=1m count=$mb 2>&1 |
+	    egrep -v "records|transferred"
+	mdconfig -a -t vnode -f $diskimage -u $mdstart
+	bsdlabel -w md$mdstart auto
 	blocksize=4096
 	while [ $blocksize -le 65536 ]; do
 		for i in 1 2 4 8; do
 			fragsize=$((blocksize / i))
-			echo "newfs -b $blocksize -f $fragsize $opt md${mdstart}${part} on a $((size / 1024 / 1024)) Mb FS"
-			newfs -b $blocksize -f $fragsize $opt md${mdstart}${part} > /dev/null 2>&1
-			mount /dev/md${mdstart}${part} $mntpoint
+			newfs -b $blocksize -f $fragsize $opt md${mdstart}$part > \
+			    /dev/null 2>&1
+			mount /dev/md${mdstart}$part $mntpoint
 			export RUNDIR=$mntpoint/stressX
-			export runRUNTIME=5m
-			(cd ..; ./run.sh disk.cfg) 
-			while mount | grep "$mntpoint" | grep -q md${mdstart}${part}; do
+			export runRUNTIME=15s
+			export RUNTIME=$runRUNTIME
+			export CTRLDIR=$mntpoint/stressX.control
+			(cd ..; ./run.sh disk.cfg) > /dev/null
+			while mount | grep "$mntpoint" | \
+			    grep -q md${mdstart}$part; do
 				umount $mntpoint > /dev/null 2>&1
 			done
 		done