git: bbdd27f9d729 - main - stress2: Avoid unrelated disk full messages from tests

The branch main has been updated by pho:

URL: https://cgit.FreeBSD.org/src/commit/?id=bbdd27f9d72941e736bec94d0538b0cdf8d26224

commit bbdd27f9d72941e736bec94d0538b0cdf8d26224
Author:     Peter Holm <pho@FreeBSD.org>
AuthorDate: 2023-01-30 08:32:43 +0000
Commit:     Peter Holm <pho@FreeBSD.org>
CommitDate: 2023-01-30 08:32:43 +0000

    stress2: Avoid unrelated disk full messages from tests
---
 tools/test/stress2/misc/unionfs5.sh | 11 ++++++-----
 tools/test/stress2/misc/unionfs6.sh |  4 ++++
 tools/test/stress2/misc/unionfs7.sh |  4 ++++
 tools/test/stress2/misc/unionfs8.sh |  8 ++++++--
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/tools/test/stress2/misc/unionfs5.sh b/tools/test/stress2/misc/unionfs5.sh
index 5e12ffbf5abd..c08f0d1f5995 100755
--- a/tools/test/stress2/misc/unionfs5.sh
+++ b/tools/test/stress2/misc/unionfs5.sh
@@ -50,8 +50,8 @@ for i in $md1 $md2; do
 	mdconfig -l | grep -q md$i && mdconfig -d -u $i
 done
 
-mdconfig -a -t swap -s 2g -u $md1
-mdconfig -a -t swap -s 2g -u $md2
+mdconfig -a -t swap -s 5g -u $md1
+mdconfig -a -t swap -s 5g -u $md2
 newfs $newfs_flags -n md$md1 > /dev/null
 newfs $newfs_flags -n md$md2 > /dev/null
 mount /dev/md$md1 $mp1
@@ -68,11 +68,12 @@ else
 	echo "Using FFS"
 	export RUNDIR=$mp1/stressX
 fi
-export runRUNTIME=2m 
+export CTRLDIR=$mp2/stressX.control
+export runRUNTIME=2m
 
-(cd ../testcases/mkdir; ./mkdir -t 2m -i 20)
+(cd ../testcases/mkdir; ./mkdir -t 2m -i 20 -l 100)
 
-find $RUNDIR -ls | head -5
+find $RUNDIR -ls | grep -v 'stressX$' | head -5
 while mount | grep -Eq "on $mp2 .*unionfs"; do
 	umount $mp2 && break
 	sleep 5
diff --git a/tools/test/stress2/misc/unionfs6.sh b/tools/test/stress2/misc/unionfs6.sh
index 7291a6f61fd8..3adc34b436ff 100755
--- a/tools/test/stress2/misc/unionfs6.sh
+++ b/tools/test/stress2/misc/unionfs6.sh
@@ -57,6 +57,10 @@ mount -t unionfs -o noatime $mp1 $mp2
 set +e
 mount | grep -E "$mp1|$mp2"
 
+set `df -ik $mp2 | tail -1 | awk '{print $4,$7}'`
+export KBLOCKS=$(($1 / 4))
+export INODES=$(($2 / 4))
+
 export CTRLDIR=$mp2/stressX.control
 export INCARNATIONS=10
 export LOAD=80
diff --git a/tools/test/stress2/misc/unionfs7.sh b/tools/test/stress2/misc/unionfs7.sh
index ad4514c60532..9c0285ef2ef5 100755
--- a/tools/test/stress2/misc/unionfs7.sh
+++ b/tools/test/stress2/misc/unionfs7.sh
@@ -60,6 +60,10 @@ mount -t unionfs -o noatime $mp1 $mp2
 set +e
 mount | grep -E "$mp1|$mp2"
 
+set `df -ik $mp2 | tail -1 | awk '{print $4,$7}'`
+export KBLOCKS=$(($1 / 4))
+export INODES=$(($2 / 4))
+
 export CTRLDIR=$mp2/stressX.control
 export INCARNATIONS=10
 export LOAD=80
diff --git a/tools/test/stress2/misc/unionfs8.sh b/tools/test/stress2/misc/unionfs8.sh
index b0d9deb354d2..15107056d85f 100755
--- a/tools/test/stress2/misc/unionfs8.sh
+++ b/tools/test/stress2/misc/unionfs8.sh
@@ -51,8 +51,8 @@ for i in $md1 $md2; do
 	mdconfig -l | grep -q md$i && mdconfig -d -u $i
 done
 
-mdconfig -a -t swap -s 4g -u $md1
-mdconfig -a -t swap -s 4g -u $md2
+mdconfig -a -t swap -s 5g -u $md1
+mdconfig -a -t swap -s 5g -u $md2
 newfs $newfs_flags -n md$md1 > /dev/null
 newfs $newfs_flags -n md$md2 > /dev/null
 mount /dev/md$md1 $mp1
@@ -69,6 +69,10 @@ mount -t unionfs -o below $mp1 $mp2
 set +e
 mount | grep -E "$mp1|$mp2"
 
+set `df -ik $mp2 | tail -1 | awk '{print $4,$7}'`
+export KBLOCKS=$(($1 / 6))
+export INODES=$(($2 / 6))
+
 export CTRLDIR=$mp2/stressX.control
 export INCARNATIONS=10
 export LOAD=80