From nobody Tue Oct 11 08:22:20 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 4Mmpg11Pk7z4fDqm; Tue, 11 Oct 2022 08:22:21 +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 4Mmpg10tK8z3Hhs; Tue, 11 Oct 2022 08:22:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665476541; 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=BInYbwnOutOs40C4mipPH+lNR063JTBtKyhCgObAv88=; b=YKRb6qzJTel0ef5qWiQYtjh2dS3abE8h4TTA29mxp6nM/dT/E1BZ7vIauc8hZmvkBMdzEM Yhi55+sLKXjmJk8M1JP9umA2ovmXxTcdmdluunjskuFY3hwLpagR9Bi8ibaUy2ugkjZtUE 1d/LO8h8wXHS/LpS7IsoNRCH7ke0YbIU3faIYKwN/jRMFnkaowFqSgTx1Ah8E3petBWzdu EPvYtZD+uqhPXyqeHkwKEODHtKe3EjzOSQ9OEzIvPxGAk2KloL9s2LLXIsvM2FwNXxRf30 rGc6fQIx0MkGI103CG0I570ArX6ev2rJ61uaTXCaR1lQ1vcxPLkKdaSUxrlHyA== 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 4Mmpg06tKPzv3D; Tue, 11 Oct 2022 08:22:20 +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 29B8MKui089923; Tue, 11 Oct 2022 08:22:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29B8MK3r089922; Tue, 11 Oct 2022 08:22:20 GMT (envelope-from git) Date: Tue, 11 Oct 2022 08:22:20 GMT Message-Id: <202210110822.29B8MK3r089922@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: bab2efd47be8 - main - stress2: Temporarily removed the rename(2) tests as these seem to trigger a deadlock. Count the number of CLEAN + MODIFIED reports from fsck_ffs and flag counts > 1 as an error 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: bab2efd47be84fa3be5a4e1f5aebb973936922ad Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665476541; 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=BInYbwnOutOs40C4mipPH+lNR063JTBtKyhCgObAv88=; b=APGD2Mvvl+IvcQKHuz8+jP53JrGwD0GeQoMA28z6y7qj/3CcuNsum8LgpTx1zEW8vlP/bJ 1V0Qg+xI1v5+7kxE7lA/2OSwFqAPrEddxFjQ9CzgY/KprPhQhBN+7mjoCqaMrXW5M9Zqmv qKTR58dHx13N+5Y3t2+1yN36ZBO/sQVVYZIzhgTSdO0axhpTDADyMlJeBj5Nm57XukJbxG FnvKn90YV1bN6eKKOHG+MIeP8Kmu6HQrgofB+gWovzxUQXcIZ7rtA10x2lga+DvruTTFsW CcEEJHQuFeA2dhGDEUqD3qy98lcls6XnS5o6qvrxk6Nhql3WDXFw9cLnV8DCng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665476541; a=rsa-sha256; cv=none; b=wkcQNtkcPziNKD+EwOpAlvPLXBxaxzX7OSfMB40j1Ai+xNF3tQTiAaPLSw7IGdGYGUil15 j4poMaAv2K20LAlr2PmifbZ4deonUY4FqCxcfgdPq/295QMwvEQ81JOgL2TxU1DtPz1kPj y4jjTN/8KLIJE8wq9jo3GrGlj4WOzU4dhZ6hfnxoT6lFxR/sxPLZZ8w9WcRad46c0j1ghD oCO9uL6e9DicuHZHyq7nSFL7QqhpONvCTZEmR4sPOoB9qufLx1lAX73rzExGLZpBtYebS2 VdcfRrIVbpwSmFI0zRhEK4ayDvDUuiP7eDFM7ZfGUF4rjDRh6nWGnqNcKn8FIA== 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=bab2efd47be84fa3be5a4e1f5aebb973936922ad commit bab2efd47be84fa3be5a4e1f5aebb973936922ad Author: Peter Holm AuthorDate: 2022-10-11 08:20:51 +0000 Commit: Peter Holm CommitDate: 2022-10-11 08:20:51 +0000 stress2: Temporarily removed the rename(2) tests as these seem to trigger a deadlock. Count the number of CLEAN + MODIFIED reports from fsck_ffs and flag counts > 1 as an error --- tools/test/stress2/misc/force9.sh | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/tools/test/stress2/misc/force9.sh b/tools/test/stress2/misc/force9.sh index a62e00242a67..7301cf00730b 100755 --- a/tools/test/stress2/misc/force9.sh +++ b/tools/test/stress2/misc/force9.sh @@ -34,9 +34,12 @@ # "panic: softdep_update_inodeblock inconsistent ip ..." seen: # https://people.freebsd.org/~pho/stress/log/log0184.txt +# Watchdog fired: https://people.freebsd.org/~pho/stress/log/log0374.txt + [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 . ../default.cfg +set -u log=/tmp/force7.sh.log mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart @@ -46,22 +49,22 @@ flags=$newfs_flags echo "newfs $flags md$mdstart" newfs $flags md$mdstart > /dev/null 2>&1 +# Exclude rename for now due to log0374.txt export TESTPROGS=`cd ..; find testcases/ -perm -1 -type f | \ - egrep -Ev "/run/|/badcode/|/pty/|/shm/|/socket/|sysctl|tcp|thr|udp"` + egrep -Ev "/run/|/badcode/|/pty/|/shm/|/socket/|sysctl|tcp|thr|udp|rename"` export runRUNTIME=3m export RUNDIR=$mntpoint/stressX +export CTRLDIR=$mntpoint/stressX.control start=`date +%s` while [ $((`date +%s` - start)) -lt $((15 * 60)) ]; do mount /dev/md$mdstart $mntpoint rm -fr $mntpoint/lost+found chmod 777 $mntpoint - echo "Start tests" su $testuser -c 'cd ..; ./testcases/run/run $TESTPROGS' > \ /dev/null 2>&1 & sleep `jot -r 1 60 180` - echo "Force destroy MD disk" while mdconfig -l | grep -q md$mdstart; do mdconfig -d -u $mdstart -o force || sleep 1 done @@ -74,9 +77,17 @@ while [ $((`date +%s` - start)) -lt $((15 * 60)) ]; do [ $((n += 1)) -gt 300 ] && { echo FAIL; exit 1; } done mdconfig -a -t vnode -f $diskimage -u $mdstart - fsck_ffs -fyR /dev/md$mdstart > $log 2>&1; s=$? + c=0 + # Run fsck minimum two times + for i in `jot 5`; do + fsck_ffs -fy /dev/md$mdstart > $log 2>&1; s=$? + grep -q CLEAN $log && grep -q "MODIFIED" $log && c=$((c+=1)) + grep -Eq "FILE SYSTEM WAS MODIFIED" $log || break + done + [ $c -gt 1 ] && + { echo "Note: FS marked clean+modified $c times out of $i fsck runs"; s=101; } [ $s -ne 0 ] && break - grep -Eq "IS CLEAN|MARKED CLEAN" $log || { s=100; break; } + grep -Eq "IS CLEAN|MARKED CLEAN" $log || { s=102; break; } done if [ $s -eq 0 ]; then mount /dev/md$mdstart $mntpoint @@ -87,6 +98,6 @@ if [ $s -eq 0 ]; then mdconfig -d -u $mdstart rm -f $diskimage $log else - cat $log + tail -10 $log fi exit $s