Index: user/pho/stress2/misc/gjournal.sh
===================================================================
--- user/pho/stress2/misc/gjournal.sh	(revision 283557)
+++ user/pho/stress2/misc/gjournal.sh	(revision 283558)
@@ -1,72 +1,72 @@
 #!/bin/sh
 
 #
 # Copyright (c) 2011 Peter Holm <pho@FreeBSD.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: projects/stress2/misc/sendfile.sh 199142 2009-11-10 16:47:48Z pho $
+# $FreeBSD$
 #
 
 # Deadlock scenario based on kern/154228, fixed in r217880.
 
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 
 . ../default.cfg
 
 size="2g"
 m=$((mdstart + 1))
 mount | grep /media    | grep -q /dev/md && umount -f /media
 mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint
 mdconfig -l | grep -q md$mdstart &&  mdconfig -d -u $mdstart
 mdconfig -l | grep -q md$m       &&  mdconfig -d -u $m
 mdconfig -a -t swap -s $size -u $mdstart || exit 1
 
 gjournal load
 gjournal label -s $((200 * 1024 * 1024)) md$mdstart
 sleep .5
 newfs -J /dev/md$mdstart.journal > /dev/null
 mount -o async /dev/md$mdstart.journal $mntpoint
 
 here=`pwd`
 cd $mntpoint
 truncate -s 1g image
 mdconfig -a -t vnode -f image -u $m
 bsdlabel -w md$m auto
 newfs md${m}$part > /dev/null
 mount /dev/md${m}$part /media
 # dd will suspend in wdrain
 dd if=/dev/zero of=/media/zero bs=1M 2>&1 | egrep -v "records|transferred"
 while mount | grep /media | grep -q /dev/md; do
 	umount /media || sleep 1
 done
 mdconfig -d -u $m
 cd $here
 
 gjournal sync
 while mount | grep $mntpoint | grep -q /dev/md; do
 	umount $mntpoint || sleep 1
 done
 gjournal stop md$mdstart
 gjournal unload
 mdconfig -d -u $mdstart
Index: user/pho/stress2/misc/gjournal3.sh
===================================================================
--- user/pho/stress2/misc/gjournal3.sh	(revision 283557)
+++ user/pho/stress2/misc/gjournal3.sh	(revision 283558)
@@ -1,68 +1,75 @@
 #!/bin/sh
 
 #
 # Copyright (c) 2013 Peter Holm <pho@FreeBSD.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
 # $FreeBSD$
 #
 
 # Deadlock seen: http://people.freebsd.org/~pho/stress/log/gjournal3.txt
 # Fixed in r244925
 
+# kib@ wrote:
+# gjournal is good for exposing the suspension problems.  The frequency
+# of the suspensions called from the gjournal is not achievable by other
+# methods, so the tests allow to uncover the problems.  More, the gjournal
+# only establishes the suspension, without snapshotting, which also
+# makes it easier to see the issues.
+
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 
 . ../default.cfg
 
 size="2g"
 mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint
 mdconfig -l | grep -q md$mdstart &&  mdconfig -d -u $mdstart
 mdconfig -a -t swap -s $size -u $mdstart || exit 1
 
 gjournal load
 gjournal label md$mdstart
 sleep .5
 newfs -J /dev/md$mdstart.journal > /dev/null
 mount -o async /dev/md$mdstart.journal $mntpoint
 chmod 777 $mntpoint
 
 export runRUNTIME=10m
 export RUNDIR=$mntpoint/stressX
 
 su $testuser -c 'cd ../testcases/rw
 	./rw -t 2m -i 10 -l 100 > /dev/null 2>&1' &
 while kill -0 $! 2>/dev/null; do
 	mksnap_ffs $mntpoint $mntpoint/.snap/snap
 	sleep .2
 	rm -f $mntpoint/.snap/snap
 done
 wait
 
 gjournal sync
 while mount | grep $mntpoint | grep -q /dev/md; do
 	umount $mntpoint || sleep 1
 done
 gjournal stop md$mdstart
 gjournal unload
 mdconfig -d -u $mdstart