From nobody Thu Feb 03 07:06:10 2022 X-Original-To: dev-commits-src-main@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 DD5AE19AD660; Thu, 3 Feb 2022 07:06:10 +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 4Jq8pV5vVPz3kGw; Thu, 3 Feb 2022 07:06:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643871970; 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=BbXMjFfvB9v0VHzy0oC5jE7UNEoxIbKxa8NIPcrXcPI=; b=nUyb0G4I6GzWJKIvfSJqWP6xieeuhGWw/JV464nDgKkFbO38a7axWGyMiSn2+LUBG1SqSj UKBsxf9MCInG4ZD33F0ctfb7EtaiwZnKBw6BJQc6YIzugrGCtr7pn2Z6UUHspFjEyv6MDB Rckim6MTRjCAPBlY5+oLpnkuo53izI59rqNYmnjrgWa7spIZ4rv+SQYo/ha5m/rW+jcGTU 95/uWnXqcxRJdUu523DXKjjcG8QqEgP+66n8Qkq74ZxIrc8dSrgIdfktpAdMlo3e9ycsGQ Y+IcD9GVSt2u9JeH1fr/mrxi/7zPLSFB8VxLdDXK5h25aPVGFI9IX4tRbYwm0Q== 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 A70D813844; Thu, 3 Feb 2022 07:06:10 +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 21376ArR035251; Thu, 3 Feb 2022 07:06:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21376AGn035250; Thu, 3 Feb 2022 07:06:10 GMT (envelope-from git) Date: Thu, 3 Feb 2022 07:06:10 GMT Message-Id: <202202030706.21376AGn035250@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: 656194f1409b - main - stress2: Finish work on a unionfs test scenario. Enable three unionfs tests List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 656194f1409bf7ad1802584979cde77dd22bdb43 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643871970; 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=BbXMjFfvB9v0VHzy0oC5jE7UNEoxIbKxa8NIPcrXcPI=; b=kp3vo9CTdfUoAUU0b2p+CRtiNqSGPTOabFLeQsijhaXM2vK+d97c5Kh6nH8510OvQd6kr/ N2dhtRaeD2cSu6jsQ41W6EEibGZI3BJGnMaEgXP8gIXdG58hUrkXEm4PvhSuja1Sb2vipu iMxldVA+ZKv+PFU9u47TKX84mH3m7iJB2dQ00gydCerElB5ihY12bkWkPQ8+pl26nESWCA xBEt0NIE+sgj/oh/9ewN4Ufv13mVT+q/2zddV3RIMhQw2F30D9LBoAW84o8LCUbzH5is/1 6fp995Xmz9hz5Xqa/Y3hdOD/KV40VZhWSCizRRTXICBxZMSyQHZ3zxGhWkN89w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643871970; a=rsa-sha256; cv=none; b=BC0vU5PRN9CC6c9TymRd4w+tJ1+8u8Bfj4nPoQVYGzKghVq7z9SmqNAE9k3BhlpwcC84qb vKd2hC0sKzHJheJUUQwUMOo70se9yrhf56fvLI0n4lDdVnVO48c9buoxm5Zu4Z3IiuFQlp N3CYNqMoQ6GAFffrw2p/MQJtFtrKxeEP3OeeIek/rTc1AdFi8NqBLRmSj7EmJZieh9y4K7 6/jQDFnBdcKR6zexzOBowYjlsD5sSbdVYg4xZ/zi+1OUXpQwz6vfSJsiFVxIwpJneXZCek LNpaaA+lsUgEHjRcXfypQa9tQcpN57Q9HFvBAYoWGjr8fBiYqStDZb22Gw9K7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=656194f1409bf7ad1802584979cde77dd22bdb43 commit 656194f1409bf7ad1802584979cde77dd22bdb43 Author: Peter Holm AuthorDate: 2022-02-03 07:04:56 +0000 Commit: Peter Holm CommitDate: 2022-02-03 07:04:56 +0000 stress2: Finish work on a unionfs test scenario. Enable three unionfs tests --- tools/test/stress2/misc/all.exclude | 3 --- tools/test/stress2/misc/unionfs8.sh | 26 ++++++++++++++++---------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/tools/test/stress2/misc/all.exclude b/tools/test/stress2/misc/all.exclude index 54e08028e4b6..47972f162582 100644 --- a/tools/test/stress2/misc/all.exclude +++ b/tools/test/stress2/misc/all.exclude @@ -74,9 +74,6 @@ syzkaller43.sh WiP 20210906 syzkaller46.sh WiP 20210925 syzkaller47.sh WiP 20210925 truss3.sh WiP 20200915 -unionfs6.sh https://people.freebsd.org/~pho/stress/log/log0231.txt 20220112 -unionfs7.sh https://people.freebsd.org/~pho/stress/log/log0232.txt 20220113 -unionfs8.sh panic: unionfs_noderem: vnode locked recursively 20220111 unionfs9.sh https://people.freebsd.org/~pho/stress/log/log0226.txt 20220111 unionfs14.sh WiP 20220111 diff --git a/tools/test/stress2/misc/unionfs8.sh b/tools/test/stress2/misc/unionfs8.sh index 07e31dd18c50..b0d9deb354d2 100755 --- a/tools/test/stress2/misc/unionfs8.sh +++ b/tools/test/stress2/misc/unionfs8.sh @@ -62,15 +62,12 @@ umount $mp1 mdconfig -d -u $md1 mdconfig -a -t vnode -f $I -u $md1 mount -t cd9660 /dev/md$mdstart $mp1 -ls -l $mp1 mount /dev/md$md2 $mp2 chmod 777 $mp2 mount -t unionfs -o below $mp1 $mp2 set +e mount | grep -E "$mp1|$mp2" -ls -ld $mp1 $mp2 -ls -l $mp1 $mp2 export CTRLDIR=$mp2/stressX.control export INCARNATIONS=10 @@ -100,14 +97,23 @@ testcases/swap/swap export TESTPROGS=`echo $TESTPROGS | sed 's/\n/ /g'` set +e -###su $testuser -c \ -### "(cd $mp2/stress2; ./testcases/run/run $TESTPROGS)" +su $testuser -c \ + "(cd $mp2/stress2; ./testcases/run/run $TESTPROGS)" -umount $mp2 # The unionfs mount -umount $mp2 -n=`find $mp1/stressX | wc -l` -[ $n -eq 1 ] && s=0 || { find $mp1/stressX -ls | head -12; s=1; } -umount $mp1 +n=`find $mp2/stressX 2>/dev/null | wc -l` +[ $n -eq 1 ] && s=0 || { find $mp2/stressX -ls 2>/dev/null | head -12; s=1; } + +while mount | grep "on $mp2" | grep -q unionfs; do + umount $mp2 && break +done +for i in `jot 5`; do + umount $mp2 && break + sleep .5 +done +for i in `jot 5`; do + umount $mp1 && break + sleep .5 +done mdconfig -d -u $md2 mdconfig -d -u $md1 rm -f $I