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

[Peter Holm]

Author: pho
Date: Fri Feb  3 12:21:15 2017
New Revision: 313151
URL: https://svnweb.freebsd.org/changeset/base/313151

Log:
  Changed barrier from memory size to kernel stack size. This will allow
  the tests to run on i386, when configured for ZFS.
  
  Sponsored by:	Dell EMC Isilon

Modified:
  user/pho/stress2/misc/zfs.sh
  user/pho/stress2/misc/zfs2.sh
  user/pho/stress2/misc/zfs3.sh
  user/pho/stress2/misc/zfs4.sh
  user/pho/stress2/misc/zfs5.sh
  user/pho/stress2/misc/zfs6.sh

Modified: user/pho/stress2/misc/zfs.sh
==============================================================================
--- user/pho/stress2/misc/zfs.sh	Fri Feb  3 12:20:44 2017	(r313150)
+++ user/pho/stress2/misc/zfs.sh	Fri Feb  3 12:21:15 2017	(r313151)
@@ -31,11 +31,12 @@
 # Simple zfs raidz test scenario
 
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
-[ $((`sysctl -n hw.usermem` / 1024 / 1024 / 1024)) -le 3 ] && exit 0
+[ `sysctl -n kern.kstack_pages` -lt 4 ] && exit 0
 
 . ../default.cfg
 
-kldstat -v | grep -q zfs.ko  || { kldload zfs.ko; loaded=1; }
+kldstat -v | grep -q zfs.ko  || { kldload zfs.ko ||
+    exit 0; loaded=1; }
 
 u1=$mdstart
 u2=$((u1 + 1))
@@ -49,6 +50,7 @@ mdconfig -s 512m -u $u1
 mdconfig -s 512m -u $u2
 mdconfig -s 512m -u $u3
 
+zpool list | egrep -q "^tank" && zpool destroy tank
 [ -d /tank ] && rm -rf /tank
 zpool create tank raidz md$u1 md$u2 md$u3
 zfs create tank/test
@@ -64,3 +66,4 @@ mdconfig -d -u $u1
 mdconfig -d -u $u2
 mdconfig -d -u $u3
 [ -n "$loaded" ] && kldunload zfs.ko
+exit 0

Modified: user/pho/stress2/misc/zfs2.sh
==============================================================================
--- user/pho/stress2/misc/zfs2.sh	Fri Feb  3 12:20:44 2017	(r313150)
+++ user/pho/stress2/misc/zfs2.sh	Fri Feb  3 12:21:15 2017	(r313151)
@@ -31,11 +31,12 @@
 # Simple zfs mirror test scenario
 
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
-[ $((`sysctl -n hw.usermem` / 1024 / 1024 / 1024)) -le 3 ] && exit 0
+[ `sysctl -n kern.kstack_pages` -lt 4 ] && exit 0
 
 . ../default.cfg
 
-kldstat -v | grep -q zfs.ko  || { kldload zfs.ko; loaded=1; }
+kldstat -v | grep -q zfs.ko  || { kldload zfs.ko ||
+    exit 0; loaded=1; }
 
 d1=${diskimage}.1
 d2=${diskimage}.2
@@ -52,6 +53,7 @@ mdconfig -l | grep -q md${u2} && mdconfi
 mdconfig -a -t vnode -f $d1 -u $u1
 mdconfig -a -t vnode -f $d2 -u $u2
 
+zpool list | egrep -q "^tank" && zpool destroy tank
 [ -d /tank ] && rm -rf /tank
 zpool create tank mirror md$u1 md$u2
 
@@ -67,3 +69,4 @@ mdconfig -d -u $u2
 
 rm -rf $d1 $d2
 [ -n "$loaded" ] && kldunload zfs.ko
+exit 0

Modified: user/pho/stress2/misc/zfs3.sh
==============================================================================
--- user/pho/stress2/misc/zfs3.sh	Fri Feb  3 12:20:44 2017	(r313150)
+++ user/pho/stress2/misc/zfs3.sh	Fri Feb  3 12:21:15 2017	(r313151)
@@ -32,12 +32,17 @@
 
 # page fault from fs/zfs/dbuf.c:1807
 
+# Page fault seen:
+# https://people.freebsd.org/~pho/stress/log/zfs3-2.txt
+# Fixed in r308887.
+
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
-[ $((`sysctl -n hw.usermem` / 1024 / 1024 / 1024)) -le 3 ] && exit 0
+[ `sysctl -n kern.kstack_pages` -lt 4 ] && exit 0
 
 . ../default.cfg
 
-kldstat -v | grep -q zfs.ko  || { kldload zfs.ko; loaded=1; }
+kldstat -v | grep -q zfs.ko  || { kldload zfs.ko ||
+    exit 0; loaded=1; }
 
 d1=${diskimage}.1
 d2=${diskimage}.2
@@ -54,6 +59,7 @@ mdconfig -l | grep -q md${u2} && mdconfi
 mdconfig -a -t vnode -f $d1 -u $u1
 mdconfig -a -t vnode -f $d2 -u $u2
 
+zpool list | egrep -q "^tank" && zpool destroy tank
 [ -d /tank ] && rm -rf /tank
 zpool create tank md$u1 md$u2
 zfs create tank/test
@@ -75,3 +81,4 @@ mdconfig -d -u $u2
 
 rm -rf $d1 $d2
 [ -n "$loaded" ] && kldunload zfs.ko
+exit 0

Modified: user/pho/stress2/misc/zfs4.sh
==============================================================================
--- user/pho/stress2/misc/zfs4.sh	Fri Feb  3 12:20:44 2017	(r313150)
+++ user/pho/stress2/misc/zfs4.sh	Fri Feb  3 12:21:15 2017	(r313151)
@@ -31,11 +31,12 @@
 # Simple zfs snapshot test scenario
 
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
-[ $((`sysctl -n hw.usermem` / 1024 / 1024 / 1024)) -le 3 ] && exit 0
+[ `sysctl -n kern.kstack_pages` -lt 4 ] && exit 0
 
 . ../default.cfg
 
-kldstat -v | grep -q zfs.ko  || { kldload zfs.ko; loaded=1; }
+kldstat -v | grep -q zfs.ko  || { kldload zfs.ko ||
+    exit 0; loaded=1; }
 
 d1=${diskimage}.1
 d2=${diskimage}.2
@@ -52,6 +53,7 @@ mdconfig -l | grep -q md${u2} && mdconfi
 mdconfig -a -t vnode -f $d1 -u $u1
 mdconfig -a -t vnode -f $d2 -u $u2
 
+zpool list | egrep -q "^tank" && zpool destroy tank
 [ -d /tank ] && rm -rf /tank
 zpool create tank md$u1 md$u2
 zfs create tank/test
@@ -78,3 +80,4 @@ mdconfig -d -u $u2
 
 rm -rf $d1 $d2
 [ -n "$loaded" ] && kldunload zfs.ko
+exit 0

Modified: user/pho/stress2/misc/zfs5.sh
==============================================================================
--- user/pho/stress2/misc/zfs5.sh	Fri Feb  3 12:20:44 2017	(r313150)
+++ user/pho/stress2/misc/zfs5.sh	Fri Feb  3 12:21:15 2017	(r313151)
@@ -31,11 +31,12 @@
 # Simple zfs test of vdev as a file and snapshot clones
 
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
-[ $((`sysctl -n hw.usermem` / 1024 / 1024 / 1024)) -le 3 ] && exit 0
+[ `sysctl -n kern.kstack_pages` -lt 4 ] && exit 0
 
 . ../default.cfg
 
-kldstat -v | grep -q zfs.ko  || { kldload zfs.ko; loaded=1; }
+kldstat -v | grep -q zfs.ko  || { kldload zfs.ko ||
+    exit 0; loaded=1; }
 
 d1=${diskimage}.1
 d2=${diskimage}.2
@@ -43,6 +44,7 @@ d2=${diskimage}.2
 dd if=/dev/zero of=$d1 bs=1m count=1k 2>&1 | egrep -v "records|transferred"
 dd if=/dev/zero of=$d2 bs=1m count=1k 2>&1 | egrep -v "records|transferred"
 
+zpool list | egrep -q "^tank" && zpool destroy tank
 [ -d /tank ] && rm -rf /tank
 zpool create tank $d1 $d2
 zfs create tank/test

Modified: user/pho/stress2/misc/zfs6.sh
==============================================================================
--- user/pho/stress2/misc/zfs6.sh	Fri Feb  3 12:20:44 2017	(r313150)
+++ user/pho/stress2/misc/zfs6.sh	Fri Feb  3 12:21:15 2017	(r313151)
@@ -32,11 +32,12 @@
 # https://people.freebsd.org/~pho/stress/log/zfs6.txt
 
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
-[ $((`sysctl -n hw.usermem` / 1024 / 1024 / 1024)) -le 3 ] && exit 0
+[ `sysctl -n kern.kstack_pages` -lt 4 ] && exit 0
 
 . ../default.cfg
 
-kldstat -v | grep -q zfs.ko  || { kldload zfs.ko; loaded=1; }
+kldstat -v | grep -q zfs.ko  || { kldload zfs.ko ||
+    exit 0; loaded=1; }
 
 u1=$mdstart
 u2=$((u1 + 1))
@@ -50,7 +51,7 @@ mdconfig -s 512m -u $u1
 mdconfig -s 512m -u $u2
 mdconfig -s 512m -u $u3
 
-zpool list | grep -q tank && zpool destroy tank
+zpool list | egrep -q "^tank" && zpool destroy tank
 [ -d /tank ] && rm -rf /tank
 zpool create tank raidz md$u1 md$u2 md$u3 || exit 1
 zfs create tank/test || exit 1