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

[Peter Holm]

Author: pho
Date: Tue Mar 29 07:38:43 2016
New Revision: 297372
URL: https://svnweb.freebsd.org/changeset/base/297372

Log:
  Cleanup SUJ tests: Added findings and improve cleanup.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  user/pho/stress2/misc/suj29.sh
  user/pho/stress2/misc/suj33.sh
  user/pho/stress2/misc/suj7.sh

Modified: user/pho/stress2/misc/suj29.sh
==============================================================================
--- user/pho/stress2/misc/suj29.sh	Tue Mar 29 07:00:04 2016	(r297371)
+++ user/pho/stress2/misc/suj29.sh	Tue Mar 29 07:38:43 2016	(r297372)
@@ -33,6 +33,10 @@
 # tunefs -j enable -S xxx regression test
 # causes "Sparse journal inode 4."
 
+# Deadlocks seen:
+# https://people.freebsd.org/~pho/stress/log/jeff116.txt
+# https://people.freebsd.org/~pho/stress/log/jeff117.txt
+
 . ../default.cfg
 
 mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint

Modified: user/pho/stress2/misc/suj33.sh
==============================================================================
--- user/pho/stress2/misc/suj33.sh	Tue Mar 29 07:00:04 2016	(r297371)
+++ user/pho/stress2/misc/suj33.sh	Tue Mar 29 07:38:43 2016	(r297372)
@@ -49,7 +49,8 @@ chmod 777 $mntpoint
 su $testuser -c '(cd ..; ./run.sh disk.cfg)' > /dev/null 2>&1 &
 sleep 20
 umount $mntpoint
-killall -u $testuser
+kill $!
+../tools/killall.sh
 wait
 
 while mount | grep -q "$mntpoint "; do

Modified: user/pho/stress2/misc/suj7.sh
==============================================================================
--- user/pho/stress2/misc/suj7.sh	Tue Mar 29 07:00:04 2016	(r297371)
+++ user/pho/stress2/misc/suj7.sh	Tue Mar 29 07:38:43 2016	(r297372)
@@ -48,7 +48,13 @@ while mount | grep $mntpoint | grep -q /
 	umount $mntpoint > /dev/null 2>&1 || sleep 1
 done
 
-mount /dev/md${mdstart}$part $mntpoint
+# Expect console output:
+# Failed to find journal.  Use tunefs to create one
+# Failed to start journal: 2
+
+echo "Expect: \"mount: /dev/md5a: No such file or directory\""
+[ -c /dev/md${mdstart}$part ] &&
+   mount /dev/md${mdstart}$part $mntpoint
 
 while mount | grep $mntpoint | grep -q /dev/md; do
 	umount $mntpoint > /dev/null 2>&1 || sleep 1