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

Peter Holm pho at FreeBSD.org
Tue May 16 09:08:25 UTC 2017


Author: pho
Date: Tue May 16 09:08:23 2017
New Revision: 318341
URL: https://svnweb.freebsd.org/changeset/base/318341

Log:
  Tune disk and journal size to make this test run.
  
  Sponsored by:	Dell EMC Isilon

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

Modified: user/pho/stress2/misc/gjournal2.sh
==============================================================================
--- user/pho/stress2/misc/gjournal2.sh	Tue May 16 09:06:07 2017	(r318340)
+++ user/pho/stress2/misc/gjournal2.sh	Tue May 16 09:08:23 2017	(r318341)
@@ -34,22 +34,27 @@
 
 . ../default.cfg
 
-size="2g"
+[ `swapinfo | wc -l` -eq 1 ] && exit 0
+size="5g"
+jsize="3g"
+[ $((`sysctl -n hw.usermem` / 1024 / 1024 / 1024)) -le ${size%g} ] && exit 0
+[ `swapinfo -k | tail -1 | awk '{print int($4/1024/1024)}'` -lt \
+    ${size%g} ] && exit 0
 mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint
-mdconfig -l | grep -q md$mdstart &&  mdconfig -d -u $mdstart
+[ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart
 mdconfig -a -t swap -s $size -u $mdstart || exit 1
 
 gjournal load
-gjournal label md$mdstart
+gjournal label -s $jsize 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=30m
+export runRUNTIME=10m
 export RUNDIR=$mntpoint/stressX
 
-su $testuser -c 'cd ..; ./run.sh marcus.cfg'
+su $testuser -c 'cd ..; ./run.sh marcus.cfg' > /dev/null 2>&1
 
 gjournal sync
 while mount | grep $mntpoint | grep -q /dev/md; do


More information about the svn-src-user mailing list