From nobody Mon Jan 30 08:33:27 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P51fb5Gnjz3bvPC; Mon, 30 Jan 2023 08:33:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P51fb4MHVz3hmh; Mon, 30 Jan 2023 08:33:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675067607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CIT1rOixjsG5PVs3pDoXSey7sz1PZ0/mpw8Fa0e2RYU=; b=aY8SC3885nKHvpeK+pDlW7Tkx48UKYJbrxcO6vdW237rQeU8PHzg8z+Lwbw8fwU7DTqtXT Rq9PUT8MwNggb1gyajIvyIcYznA1OpT+Dv5kuifbLmMyue5ubl6umyQ2bfOywFqjtTERqC Ad/PtaOZ/kT3VmlyfLCWjTmpjHJ1czi8ir+gQFh6pYYrudqLb3JXDg/u99cm01Q+xFuvK7 +NxChoOoyD4/4naYQh9tK9fNqc6l5gfertIMNmnRsF+7JTZcBDHgwBZUsMe9ZFvKW3NYd1 hy6oxAneREXl3tQz4qI3cytTlHHEYUUUn/yIe6wGF/HJYvIj2A5SDVrFQAUurg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675067607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CIT1rOixjsG5PVs3pDoXSey7sz1PZ0/mpw8Fa0e2RYU=; b=BCwZbpbvHgUT2UIhL6R8W+0W4XLKhSVIwTWNp3ji1TIJdFmEN9LK7vJYpbU0skMUsbrNjX DUIuILZ3BDmeUCSrWqfb+4Hn09SFNln3neky4R+FqQwBC5m5PnyfyngbfTtIAYlA7b27uJ 2eCZxoDFX7NjbCos+d4SZ7JM0WdCSEnpj+3dP3Q+jLQI+Zjkr3Tl/lFO435alslS/nwMcA grNjKz/vO1tZLnTXFic8AktdI7O2bj6wthbyBLNCRpKVrtJHnKZh24a7vLE3XeTanVUwqq JUklHolY74kBeoHLf2L2sZ7oH1sDU5kt/dB/wbgemeXXXpZPkV+A+UQHyuhxmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675067607; a=rsa-sha256; cv=none; b=oTgkUBlnPDtW3TQ4TvyRYuYU/hf0YhhI8J9k1i1rsAjsU4IJ6azxdvd434tPMTRN28QZBF yU98D/5MEAaAPRhFMzi8+SekZ0TaOTjpZsxm+5KuSZT/7VUxAHzzhhr5tUHFfENAbG8/Lb UjHkYE5Vmqa1AT6/LAQvxXyXd6YuPxUqTp0VvdlJnPS5UVOlYp6is9HZhS7OLPNLhf0LC7 45RwD97MjsV/Rt+7g9OftMZCuHw5Md1fmwXITlv8AhRz+ursD7cLCTxb4REDWWC6l16YOh Q6XIxhCdJfmGSDQIu67aVCrZa0fpjuMMZT66qY+s6Xa05O5pkma9qg7U78EubQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P51fb3GlKz11jH; Mon, 30 Jan 2023 08:33:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30U8XRRP058048; Mon, 30 Jan 2023 08:33:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30U8XR91058047; Mon, 30 Jan 2023 08:33:27 GMT (envelope-from git) Date: Mon, 30 Jan 2023 08:33:27 GMT Message-Id: <202301300833.30U8XR91058047@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Peter Holm Subject: git: bbdd27f9d729 - main - stress2: Avoid unrelated disk full messages from tests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pho X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bbdd27f9d72941e736bec94d0538b0cdf8d26224 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=bbdd27f9d72941e736bec94d0538b0cdf8d26224 commit bbdd27f9d72941e736bec94d0538b0cdf8d26224 Author: Peter Holm AuthorDate: 2023-01-30 08:32:43 +0000 Commit: Peter Holm 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