From nobody Thu Nov 10 09:13:41 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 4N7GNP2QQ9z4XDjM; Thu, 10 Nov 2022 09:13:41 +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 4N7GNP1s3xz3PQk; Thu, 10 Nov 2022 09:13:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668071621; 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=r7fqhbe66dGXhrNAJZtfg8QjSVP3Dpr0yp1zWQRITzw=; b=oyPgzLQ6rrwkp2kGX4HUKO8HC+9VrgtLkZN6KDuAyS4z/5kWv97M7im3INzjoHOirgnGlo 4c8M9FIG6VgjxTAJZciWTPm32gJRQ5E8hF4seI3LGTkAXkn+bZ5BRSvXTZylLPfOAtHzCF mugwm3TgCcox6Ym1/tL/2n9TlLRzzmfa1Hc9ydDHNFjGsEcHcL+qJ0Q5N1QJDPKtnrcpNC dty0FvkcksGk2nnCYXiUPoD2BN7/o84FfeC6YIUvRokJAxsY/nlRZoViegZi7g9a/9V2My ILmorB6utelQImdwR2FqLqeQlAvl28um1pyv9uJDoGoWFT4sYv/MiLidaPQlsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668071621; 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=r7fqhbe66dGXhrNAJZtfg8QjSVP3Dpr0yp1zWQRITzw=; b=PO+QHfgaG4b38p/aMDIgdOiHm4KXevnn4ZJ/1t1zUuUZh3nXioA2is3f0TQqtRaqjvfYvt E9RZY42qxZTfhDymeiLjZpJea3hPX55RS9SYFGiXhsR+4YbAzSIlCPujpRZsLN9ieCvZhm x+E0LefpOl/WixMB5qqPXR2zpPZcS83cWMAXuKGE8JnSRHrY5fazjqflIQTeljTmt4hVKg XM2lmwqv6l5HEU3Yu5fUT6NO6cDl7tuXmOBizE2uJatF0XPyS0SNi+GvhU1+TGesP/AFKh qJDwyOXMwB1oOsq6F0QvU8Cb5PCHxL9eW2T9aoWMEg3Y9r49haEoLK3XLOh0iA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668071621; a=rsa-sha256; cv=none; b=AA/RbcrsS9g8zC3X9PS1oxJGPAxISXWdvhBdRC0SSgWMzmjWBWvH/EQfP0+6aoyGYajKC+ v8Qqq+dmdIDlE7PW5lsa0UpY+XNUBkErdaVtwltZzcd3P+LQ3fKE5zIq9ukJ6zpjYTHIJF 6zojMW3B9fGnSNshieJDQTm1iufAG78D2GIOvgaFg2P7G7HHiCNdOpvmq+IKYCaIFX6ZjD Tu2/YQ5TJ/bMqaKoTIbrMSTpjsQfMWeNjaoKlISByDARuo+ZcdMbHTwobGY7PNmsReSiiC bABhhovzg3oZCkNKSXsh4uULqAqHbH5sLMRJ7hjMXGBy0obJ/26fFFRsZxumGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4N7GNP0tfRzvrw; Thu, 10 Nov 2022 09:13:41 +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 2AA9DfBu048368; Thu, 10 Nov 2022 09:13:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AA9Dftf048367; Thu, 10 Nov 2022 09:13:41 GMT (envelope-from git) Date: Thu, 10 Nov 2022 09:13:41 GMT Message-Id: <202211100913.2AA9Dftf048367@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: f31ca922cb06 - main - stress2: Add SU+J as a test. Save fsck_ffs core dump, if any 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: f31ca922cb062b30168bc9780755a95153151ea5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=f31ca922cb062b30168bc9780755a95153151ea5 commit f31ca922cb062b30168bc9780755a95153151ea5 Author: Peter Holm AuthorDate: 2022-11-10 09:12:46 +0000 Commit: Peter Holm CommitDate: 2022-11-10 09:12:46 +0000 stress2: Add SU+J as a test. Save fsck_ffs core dump, if any --- tools/test/stress2/misc/fsck.sh | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/tools/test/stress2/misc/fsck.sh b/tools/test/stress2/misc/fsck.sh index 972150dc6fac..fe9bd9502d3d 100755 --- a/tools/test/stress2/misc/fsck.sh +++ b/tools/test/stress2/misc/fsck.sh @@ -49,9 +49,12 @@ u2=$((mdstart + 1)) mp1=${mntpoint}$u1 mp2=${mntpoint}$u2 mkdir -p $mp1 $mp2 -log=$mp1/fsck.sh.log -diskimage=$mp1/fsck.sh.diskimage + backup=/tmp/fsck.sh.diskimage.`date +%Y%m%dT%H%M%S`.gz +core=/tmp/fsck.sh.core.`date +%Y%m%dT%H%M%S` +diskimage=$mp1/fsck.sh.diskimage +log=$mp1/fsck.sh.log + asbs=0 cleans=0 reruns=0 @@ -71,6 +74,7 @@ mount /dev/md$u1 $mp1 [ -c /dev/md$u2 ] && mdconfig -d -u $u2 dd if=/dev/zero of=$diskimage bs=$max count=1 status=none mdconfig -a -t vnode -f $diskimage -u $u2 +[ "$newfs_flags" = "-U" ] && [ `jot -r 1 0 1` -eq 1 ] && newfs_flags="-j" backups=`newfs -N $newfs_flags md$u2 | grep -A1 "super-block backups" | \ tail -1 | sed 's/,//g'` newfs $newfs_flags md$u2 > /dev/null @@ -144,7 +148,8 @@ while [ $((`date +%s` - start)) -lt 60 ]; do break done mount | grep -q "on $mp2 " && umount $mp2 -mdconfig -d -u $u2 || exit 1 +mdconfig -l | grep -q "md$u2" && + mdconfig -d -u $u2 echo "$cleans cleans, $reruns reruns, $asbs alternate SBs." if [ $clean -ne 1 ]; then @@ -153,8 +158,9 @@ if [ $clean -ne 1 ]; then cp -v $log /tmp [ $s -eq 0 ] && s=106 fi -echo * | grep -q core && { ls -l *.core; cp $log /tmp; exit 106; } || - rm -f $backup +[ -f fsck_ffs.core ] && + mv fsck_ffs.core $core +[ $s -eq 0 ] && rm -f $backup cd /tmp umount $mp1 mdconfig -d -u $u1