From nobody Tue Oct 12 06:45:47 2021 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 AAFE117F5369; Tue, 12 Oct 2021 06:45:47 +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 4HT5lb31LRz4mgS; Tue, 12 Oct 2021 06:45:47 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 25A527CC3; Tue, 12 Oct 2021 06:45:47 +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 19C6jl9b028926; Tue, 12 Oct 2021 06:45:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19C6jlBs028925; Tue, 12 Oct 2021 06:45:47 GMT (envelope-from git) Date: Tue, 12 Oct 2021 06:45:47 GMT Message-Id: <202110120645.19C6jlBs028925@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: fc22fe5c7405 - main - stress2: Use two memory disks for this test 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: fc22fe5c74055802ac41090f345c8a45eab396b6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=fc22fe5c74055802ac41090f345c8a45eab396b6 commit fc22fe5c74055802ac41090f345c8a45eab396b6 Author: Peter Holm AuthorDate: 2021-10-12 06:45:19 +0000 Commit: Peter Holm CommitDate: 2021-10-12 06:45:19 +0000 stress2: Use two memory disks for this test --- tools/test/stress2/misc/unionfs.sh | 72 ++++++++++++++++++++++++++++---------- 1 file changed, 54 insertions(+), 18 deletions(-) diff --git a/tools/test/stress2/misc/unionfs.sh b/tools/test/stress2/misc/unionfs.sh index 6e04e809b501..16572de6b3b5 100755 --- a/tools/test/stress2/misc/unionfs.sh +++ b/tools/test/stress2/misc/unionfs.sh @@ -26,29 +26,65 @@ # SUCH DAMAGE. # +# unionfs test using two memory disks + [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 +. ../default.cfg -# "insmntque: non-locked vp: 0xd2462e10 is not exclusive locked ..." seen. +# unionfs usage example from the man page: +# mount -t cd9660 -o ro /dev/cd0 /usr/src +# mount -t unionfs -o noatime /var/obj /usr/src -. ../default.cfg +md1=$mdstart +md2=$((md1 + 1)) +mp1=/mnt$md1 +mp2=/mnt$md2 +mkdir -p $mp1 $mp2 +set -e +for i in $mp1 $mp2; do + mount | grep -q "on $i " && umount -f $i +done +for i in $md1 $md2; do + mdconfig -l | grep -q md$i && mdconfig -d -u $i +done -truncate -s 256M $diskimage +mdconfig -a -t swap -s 2g -u $md1 +mdconfig -a -t swap -s 2g -u $md2 +newfs $newfs_flags -n md$md1 > /dev/null +newfs $newfs_flags -n md$md2 > /dev/null +mount /dev/md$md1 $mp1 +mount /dev/md$md2 $mp2 -mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint -mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart +mount -t unionfs -o noatime $mp1 $mp2 +mount | grep -E "$mp1|$mp2" +set +e + +export RUNDIR=$mp2/stressX +export CTRLDIR=$mp2/stressX.control +export runRUNTIME=2m + +# SU work around for "disk full" +set `df -ik $mp2 | tail -1 | awk '{print $4,$7}'` +export KBLOCKS=$(($1 / 2)) +export INODES=$(($2 / 2)) -mdconfig -a -t vnode -f $diskimage -u $mdstart -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint -mount -t unionfs -o noatime $mntpoint /tmp -export RUNDIR=/tmp/stressX -export runRUNTIME=10m # Run tests for 10 minutes (cd ..; ./run.sh disk.cfg) -umount /tmp -while mount | grep $mntpoint | grep -q /dev/md; do - umount $mntpoint || sleep 1 + +find $RUNDIR -ls +for i in `jot 5`; do + mount | grep -q unionfs || break + umount $mp2 || sleep 2 # The unionfs mount +done +mount | grep unionfs && exit 1 + +for i in `jot 5`; do + umount $mp2 && break + sleep 2 done -mdconfig -d -u $mdstart -rm -f $diskimage -exit 0 +mount | grep -q "on $mp2 " && exit 1 +n=`find $mp1/stressX | wc -l` +[ $n -eq 1 ] && s=0 || s=1 +umount $mp1 +mdconfig -d -u $md2 +mdconfig -d -u $md1 +exit $s