From nobody Wed Feb 16 09:21:27 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 DDBA219D76F3; Wed, 16 Feb 2022 09:21: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 4JzCBb5y53z4hKH; Wed, 16 Feb 2022 09:21:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645003287; 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=tY/XpX7YJvPGbp7KKUPTOf+sBZxP6oPCw0Di76hMslk=; b=dgqlH9d+iw9vop+08QwolbtbT+y2rWZCceOoyu2oozkMz2GOa31oEbbt4loV766YbL8DF8 Mj41rT/vNijjXGo1zW20s6RrErZDRopy5YwpRPlf7/WZHWgwHx8RkOUNvlF3kVQrbhyWeh +Z6qBCwrtFund2vlWaem8eUbvLcd1qTMxw2U2r+cxFVcP9LpFDRvm/0bLpB/wuoTmsUS/N K/wXBfg/Jb/e66V5egdteWhGLDJPxrwEezk0wyKmXW3gmjn0ReE6jCxAXg5U0ytG2fpBO7 s/9H0X/JmSCWRqlhnXGdCBEqNdZYHKl3u1KzVT9RiGQ4tWUpBLapnzjmJDC2pw== 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 AC38B136FC; Wed, 16 Feb 2022 09:21: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 21G9LRuV065732; Wed, 16 Feb 2022 09:21:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21G9LRAo065731; Wed, 16 Feb 2022 09:21:27 GMT (envelope-from git) Date: Wed, 16 Feb 2022 09:21:27 GMT Message-Id: <202202160921.21G9LRAo065731@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: 87000c893c24 - main - stress2: Finish work on two gunion(8) test scenarios 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: 87000c893c2474c7ac47e2934e1773df921c4732 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645003287; 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=tY/XpX7YJvPGbp7KKUPTOf+sBZxP6oPCw0Di76hMslk=; b=eqrzgj0w1EDsP4PLy2oZAOaiOZMDP8pLZb4StB2kGZCRvSS3YO199h4QA2vhNSxOz2efuO cIEepTxz1ETK1tXk27iyGi4du3cHff+y0yKWCgTGHmyMSpOC5veNSKMVu3ipjA3xTsRK0l w9yfhp9QUzNqDq3LkvQ9ZCt3cNRedaMkDs+kCDze83/oNiOCVe8W9DuvAXN7D7auo4CT0r SrMNkqbwRue3QT8p7QonsSRFyZ44p25RX5ixEH2dmLuFPAc7x0bHduS/JnyBiCxSya/ael Hd17D3oJnK+UZcZI1NNKNzXgqvcNZSrjibeVikYi9++lSyIlrjoVCiEtCZrRhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645003287; a=rsa-sha256; cv=none; b=CPH/rMjg13NtAbocD2njnJn8F9UpstkXO0XhlVio0878xgp+fA1JsmISsauQiw3cmD/DZh uel0QFzK6ZSqP+/URwEZo5Ipz426GaXoLxC42fv6iUmDHRgDUdXLNfdVhkh8RNOE/Rl8hv KDWU76DhRi9/B0DzFiy4EQAYHcUOYegDsmMvbkdi8G3aEUG/7h3sbKPBJdCNWGLL42S/HT OYLKMOjE/QDmyxNprwrsXXAsuUsc1Vd0qmAJ65YUDqxSySLZwOhRNldTGVIU52yAlydlmG dL6oo3DBhMJKrq/j0niCb1RJlvBmpvIdwXULBdv5h2uUPJ3wdP6KG6nnWsbOSA== 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=87000c893c2474c7ac47e2934e1773df921c4732 commit 87000c893c2474c7ac47e2934e1773df921c4732 Author: Peter Holm AuthorDate: 2022-02-16 09:20:39 +0000 Commit: Peter Holm CommitDate: 2022-02-16 09:20:39 +0000 stress2: Finish work on two gunion(8) test scenarios --- tools/test/stress2/misc/gunion.sh | 5 +++-- tools/test/stress2/misc/gunion2.sh | 7 +++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/test/stress2/misc/gunion.sh b/tools/test/stress2/misc/gunion.sh index 6ba60de3f988..c7d376e5409e 100755 --- a/tools/test/stress2/misc/gunion.sh +++ b/tools/test/stress2/misc/gunion.sh @@ -43,7 +43,7 @@ s=0 set -e mdconfig -a -t swap -s 5g -u $md1 -newfs $newfs_flags -n /dev/md$md1 +newfs $newfs_flags -n /dev/md$md1 > /dev/null mkdir -p $mp1 $mp2 mount /dev/md$md1 $mp1 cp -r ../../stress2 $mp1 @@ -73,9 +73,10 @@ fsck_ffs -fyR /dev/md$md2-md$md1.union > $log 2>&1 grep -Eq "IS CLEAN|MARKED CLEAN" $log || { s=2; cat $log; } set +e gunion commit /dev/md$md2-md$md1.union +gunion list | egrep Block\|Current | egrep -v 0 && s=3 gunion destroy /dev/md$md2-md$md1.union fsck_ffs -fyR /dev/md$md1 > $log 2>&1 -grep -Eq "IS CLEAN|MARKED CLEAN" $log || { s=3; cat $log; } +grep -Eq "IS CLEAN|MARKED CLEAN" $log || { s=4; cat $log; } mdconfig -d -u $md2 mdconfig -d -u $md1 rm -f $log diff --git a/tools/test/stress2/misc/gunion2.sh b/tools/test/stress2/misc/gunion2.sh index e6a7ab6331cb..a8fe180c48af 100755 --- a/tools/test/stress2/misc/gunion2.sh +++ b/tools/test/stress2/misc/gunion2.sh @@ -43,7 +43,7 @@ s=0 set -e mdconfig -a -t swap -s 5g -u $md1 -newfs $newfs_flags -n /dev/md$md1 > /dev/null +newfs -n /dev/md$md1 > /dev/null mkdir -p $mp1 $mp2 mount /dev/md$md1 $mp1 cp -r ../../stress2 $mp1 @@ -84,8 +84,6 @@ chmod 777 $mntpoint su $testuser -c \ "(cd $mntpoint/stress2; ./testcases/run/run $TESTPROGS)" -n=`find $mntpoint/stressX | wc -l` -[ $n -eq 1 ] && s=0 || s=1 for i in `jot 6`; do mount | grep -q "on $mntpoint " || break umount $mntpoint && break || sleep 10 @@ -96,9 +94,10 @@ fsck_ffs -fyR /dev/md$md2-md$md1.union > $log 2>&1 grep -Eq "IS CLEAN|MARKED CLEAN" $log || { s=2; cat $log; } set +e gunion commit /dev/md$md2-md$md1.union +gunion list | egrep Block\|Current | egrep -v 0 && s=3 gunion destroy /dev/md$md2-md$md1.union fsck_ffs -fyR /dev/md$md1 > $log 2>&1 -grep -Eq "IS CLEAN|MARKED CLEAN" $log || { s=3; cat $log; } +grep -Eq "IS CLEAN|MARKED CLEAN" $log || { s=4; cat $log; } mdconfig -d -u $md2 mdconfig -d -u $md1 rm -f $log