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

[Peter Holm]

Author: pho
Date: Sun Mar  8 06:06:20 2020
New Revision: 358735
URL: https://svnweb.freebsd.org/changeset/base/358735

Log:
  This tests would sometimes run for more than an hour. Fix that.

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

Modified: user/pho/stress2/misc/zfs4.sh
==============================================================================
--- user/pho/stress2/misc/zfs4.sh	Sun Mar  8 00:23:36 2020	(r358734)
+++ user/pho/stress2/misc/zfs4.sh	Sun Mar  8 06:06:20 2020	(r358735)
@@ -62,6 +62,7 @@ zfs set snapdir=visible stress2_tank/test
 
 export RUNDIR=/stress2_tank/test/stressX
 export runRUNTIME=10m
+start=`date +%s`
 (cd ..; ./run.sh marcus.cfg) &
 
 for i in `jot 20`; do
@@ -70,9 +71,17 @@ done
 for i in `jot 20`; do
 	zfs destroy  stress2_tank/test at snap$i
 done
+while pgrep -fq run.sh; do
+	[ $((`date +%s` - start)) -gt 660 ] &&
+	    ../tools/killall.sh
+	sleep 10
+done
 wait
 
-zfs destroy -r stress2_tank
+for i in `jot 3`; do
+	zfs destroy -r stress2_tank && break
+	sleep 10
+done
 zpool destroy stress2_tank
 
 mdconfig -d -u $u1