From nobody Thu Mar 03 13:30:37 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 986791A04D1C; Thu, 3 Mar 2022 13:30:37 +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 4K8X193pYRz3GML; Thu, 3 Mar 2022 13:30:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646314237; 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=zJw0+G0Icj4GLHPXC6ThiBOxSJYcAQVx4qh25XuOQWw=; b=Q5ezmMkbqSq7H6H0KWuXeeWxUM2/achiZjtbPDjg7WM/5LsGssPIlU1DKkQCyBU4ofaXkX osLxkfYfWfh85ttaGu38vgPHLUFkmzljz63Wpfn1oXx4h4e0qNN2PDwRR/bxGliPn1qma5 CQAMXaYKi3FOY4xQ0mwREe3Lwa++iXShTsbMKTtAsoq/blUsXe33AQZEe2kApJbfjhSoVJ JOl8v9El1PmIzRat3koxh7yeY6kWBXOkCi9QvfomOy/ePTqFsAi0ZYuwgIJ0GQjBWgKPCs 96ZcOl9QhKmi850Q7v6aly5Pvk9Ih0YXRpqHPy6Pc3JTVivCgWYxsonODnWeEQ== 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 6275E18274; Thu, 3 Mar 2022 13:30:37 +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 223DUbA8023278; Thu, 3 Mar 2022 13:30:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 223DUbld023277; Thu, 3 Mar 2022 13:30:37 GMT (envelope-from git) Date: Thu, 3 Mar 2022 13:30:37 GMT Message-Id: <202203031330.223DUbld023277@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: 70cb626635fa - main - stress2: Reworked and cleaned up this test scenaio. 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: 70cb626635fa18d654c3a1ec2e8e3f8749b64c31 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646314237; 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=zJw0+G0Icj4GLHPXC6ThiBOxSJYcAQVx4qh25XuOQWw=; b=ts4BHwAPw2o5Le+P2+8WVVfZs292v0V3IlqGp/kiUmYnzpMmBmHOwrYfgcH5ljBboXhK1d YfSJFcoGPV/W+TvTJQGGlvqs3VsLQ7PcPWA6Kfz8SmFiq/qFcDWtzO3vCelWorRy5K0ESZ qkbr4BqByXtHgWletR0sVBkdBa283a9GrFjQVDpU5E9oq3WqMJD/97cZNM2WI/oqFtiGWS 63KWBmEUq+6DhHAVGWj0/nqQ1Ir8NbgXwha2rxc5qjayZ5FKQuW1AMvP6g5a57MaxO+iMg 9eA09Ork7BaTkK5Dncw4u+DvNjw7aiLxXDPvbg/JaJ0wap/CEVhlIS3wbMaAZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646314237; a=rsa-sha256; cv=none; b=wCTZNR0FgTJCFuuvkpzV3Gei30UjJIvdzcgDq9poA9B8UlgT0AqWSmozBvmmjyZLZtuGst ZXLR8lO64fdDEDox8yiYJhjVQXlNbq9NslcI34r42rba9X+RkHlswTbhobYgtWIfjXjNub 7DkpBBJpk2dyIDHhTydX+9uFgUBzdllr0/YGcfxcKAR+pIGqAF/gLJF1xJcLeIYLTxRIDM cjC9t/VAwWlRsH6oMtaGL82y1thTea8EcLxmcEYIidW1bzSZbS+YlvQIKV1saALlbLu0NF fJ0RFg+i12+u7NQRCImlyaaoT5YUO8fngVTOpeafsD974pgJxxUVezW+QElSQw== 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=70cb626635fa18d654c3a1ec2e8e3f8749b64c31 commit 70cb626635fa18d654c3a1ec2e8e3f8749b64c31 Author: Peter Holm AuthorDate: 2022-03-03 13:29:18 +0000 Commit: Peter Holm CommitDate: 2022-03-03 13:29:18 +0000 stress2: Reworked and cleaned up this test scenaio. --- tools/test/stress2/misc/gnop10.sh | 56 +++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 31 deletions(-) diff --git a/tools/test/stress2/misc/gnop10.sh b/tools/test/stress2/misc/gnop10.sh index 80ddc2fe1216..012104cbf9ed 100755 --- a/tools/test/stress2/misc/gnop10.sh +++ b/tools/test/stress2/misc/gnop10.sh @@ -27,7 +27,7 @@ # SUCH DAMAGE. # -# fsck test with forced unmount of a SUJ FS. +# fsck test with forced unmount of a SU FS. # Variation of gnop8.sh by Kirk McKusick # Copy of gnop9.sh. Uses SU instead of SUJ. @@ -41,9 +41,7 @@ pgrep -x mount && { pgrep -x mount | xargs ps -lp; exit 1; } fsck=/sbin/fsck_ffs fsck_loops=10 -exp=/sbin/fsck_ffs.exp # Experimental version log=/tmp/gnop10.log -[ -f $exp ] && { echo "Using $exp"; fsck=$exp; } [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s 5g -u $mdstart || exit 1 md=md$mdstart @@ -72,27 +70,27 @@ testcases/dirnprename/dirnprename testcases/dirrename/dirrename ' -set `df -ik $mntpoint | tail -1 | awk '{print $4,$7}'` -export KBLOCKS=$(($1 / 10 * 7)) -export INODES=$(($2 / 10 * 7)) - start=`date +%s` while [ $((`date +%s` - start)) -lt 600 ]; do gnop create /dev/$md || exit 1 mount /dev/$md.nop $mntpoint || exit 1 + + rm -rf $RUNDIR $CTRLDIR mkdir -p $RUNDIR $CTRLDIR chmod 777 $RUNDIR $CTRLDIR + set `df -ik $mntpoint | tail -1 | awk '{print $4,$7}'` + export KBLOCKS=$(($1 / 10 * 7)) + export INODES=$(($2 / 10 * 7)) # start your favorite I/O test here - rm -rf /tmp/stressX.control - (cd $RUNDIR && find . -delete) - su $testuser -c 'cd ..; ./testcases/run/run $TESTPROGS' & + su $testuser -c 'cd ..; ./testcases/run/run $TESTPROGS' > /dev/null 2>&1 & # after some number of seconds - sleep `jot -r 1 30 90` + sleep `jot -r 1 20 30` gnop destroy -f /dev/$md.nop ../tools/killall.sh || exit 1 + while pgrep -qU $testuser; do pkill -U $testuser; done wait # Wait until forcible unmount, may be up to about 30 seconds, @@ -102,37 +100,33 @@ while [ $((`date +%s` - start)) -lt 600 ]; do while mount | grep -q "on $mntpoint "; do [ $n -eq 0 ] && /bin/echo -n "Waiting for $mntpoint to force umount ..." n=$((n + 1)) - sleep 2 + sleep 5 if [ $((`date +%s` - s)) -ge 180 ]; then - echo "Giving up on waiting for umount of $mntpoint" - umount $mntpoint || umount -f $mntpoint - break + echo "Giving up on waiting for umount of $mntpoint" + umount $mntpoint + while mount | grep -q "on $mntpoint "; do + umount -f $mntpoint + done fi done [ $n -ne 0 ] && echo - # first fsck will attempt journal recovery - $fsck -fy /dev/$md > $log 2>&1 - - # The second fsck will do traditional check for any errors - # from journal recovery + # The initial fsck_ffs may run for more than on hour with a 5GB MD disk + t=`date +%s` + $fsck -fy /dev/$md > /dev/null 2>&1 + t=$((`date +%s`- t)) + [ $t -gt 300 ] && echo "First fsck took $(((t + 30) / 60)) minutes!" - # There seems to be a gnop cache issue, which resolves by adding - # delays between each fsck run for i in `jot $fsck_loops`; do - sleep $((i * i)) # gnop workaround - [ $i -ne 1 ] && - echo "`date +%T` $fsck loop #$((i + 1))" + sleep 10 $fsck -fy /dev/$md > $log 2>&1 - grep -Eq "IS CLEAN|MARKED CLEAN" $log && break + # For now, do not trust fsck_ffs's "CLEAN" message +# grep -Eq "IS CLEAN|MARKED CLEAN" $log && break + grep -Eq "FILE SYSTEM WAS MODIFIED" $log || break [ $i -eq $fsck_loops ] && - { echo "$fsck did not mark FS as clean"; exit 1; } - [ $i -ne 1 ] && tail -3 $log - sync; sleep 5; sync; sleep 5 + { echo "$fsck did not mark FS as clean"; tail -12 $log; exit 1; } done done -echo "Final $fsck" -sleep 3; # gnop workaround $fsck -fy /dev/$md > $log || { tail -5 $log; exit 1; } mdconfig -d -u ${md#md} rm -f $log