From nobody Sun Aug 7 08:37:43 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 4M0t4m0xMKz4YCng; Sun, 7 Aug 2022 08:37:44 +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 4M0t4l3RRkz41tF; Sun, 7 Aug 2022 08:37:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659861463; 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=bnnjj281VoH8aoOMjPxVoyXu7Hp02QPoRhSgnhrG9jY=; b=KBk7K1azEd9d10dp1sxGhbNPcyf9mCxJs+EytZumKGlJmwfICPs9CaniYN45CDR6NeSfyP V5kMR+yKL4k9iBipEIA6U7r8NTfTRAuViM1vdnEC4uFxcS+ExXUW6Qk51h7H9qBeHZOrjY INGqngZ7AVObRAodNDxXzL9R0aH3sPEU3HXeyQRPM7ZnI4vBWaFldIhlc523zq2aozl0Rd 8n8CTMlJZRFrAeaFBeo5D+1oMOi8bhuKIApohYlFgqFylNF7OV5cIZISNQ0pIf6n0ja737 rNnikfMYusmL+mo3TV6ijEPtXHguTUtHm9R2mx01giQ1w3NxBa3u+TjS3yhSDg== 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 4M0t4l2Hqsz15lJ; Sun, 7 Aug 2022 08:37:43 +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 2778bhkC085759; Sun, 7 Aug 2022 08:37:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2778bhm6085758; Sun, 7 Aug 2022 08:37:43 GMT (envelope-from git) Date: Sun, 7 Aug 2022 08:37:43 GMT Message-Id: <202208070837.2778bhm6085758@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: c9254546682c - main - stress2: Added another fsck_ffs test scenario 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: c9254546682c51ed4b97e64c5f41d9ec98c2e053 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659861463; 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=bnnjj281VoH8aoOMjPxVoyXu7Hp02QPoRhSgnhrG9jY=; b=PqoAL+U8eK3MUbXNz41Zf7enk7SA0KoGfxGcTFlml5p8D3wfD4Wv5i3Mmn97lDcTET4K1A VBNhZ5C3BnfAQT1olqnCSMvt37pba/Gg+Z+jPX40RI3FFnQZWHXQRCqgjSy3Ti97tEuHJ3 elt8FBGbjpSf7foULeISCPD6ephM+2rwpMNko/9JKQVwXVWsd83bAAcnb1xhiLUCozh/nQ cLvOe+TJ85sIvpfJuaKDnT30tvM116fxj2IPfJjR6DVC7vcsvThaGcVu42c4vU8Z5H79DU q1EVWBW5ZxN8xY7D5BgvyJvroLDTnmaO+KhvIss1DPYxPkQZ5Qm9PCTQN8TKng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659861463; a=rsa-sha256; cv=none; b=kXCuzYWAHCrnZnVkWfWXoPQMSYc6XyHdL750prFNjwySc045kQ2/K56kyBdIiympgp6WI0 NeSizdxZpiWssoZ5y4V1n+gbQyHPybuFJlNGkEaozBe/rwc+qOyubcuvUmkdJvGsCa7z2x S8+WfCd77CwFVjRWHiFeI5S8BgD1l2WUO2noc4vAGKeSP0QZD6EakhIeCB2isnbRlkbnLi lbf/LBvShsS7noqAjjgzRVVmb42S5mQDMPQ8uRXCoqyAZ48/1FyZYrCodZKywjhbfdht1g Rzzy6PBMNgX3FI+C6I7WVkdLR6gDSVKPiXFEEaSHzdm7TkLbFmGER2K/NAOjpw== 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=c9254546682c51ed4b97e64c5f41d9ec98c2e053 commit c9254546682c51ed4b97e64c5f41d9ec98c2e053 Author: Peter Holm AuthorDate: 2022-08-07 08:37:17 +0000 Commit: Peter Holm CommitDate: 2022-08-07 08:37:17 +0000 stress2: Added another fsck_ffs test scenario --- tools/test/stress2/misc/fsck9.sh | 160 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 160 insertions(+) diff --git a/tools/test/stress2/misc/fsck9.sh b/tools/test/stress2/misc/fsck9.sh new file mode 100755 index 000000000000..0297013839eb --- /dev/null +++ b/tools/test/stress2/misc/fsck9.sh @@ -0,0 +1,160 @@ +#!/bin/sh + +# +# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# +# Copyright (c) 2022 Peter Holm +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# + +# fsck_ffs(8) false CLEAN claim scenario + +# https://people.freebsd.org/~pho/fsck9.sh.diskimage.20220716T150359.txt +# https://people.freebsd.org/~pho/fsck9.sh.diskimage.20220716T150359.gz + +# https://people.freebsd.org/~pho/fsck9.sh.diskimage.20220716T172428.txt +# https://people.freebsd.org/~pho/fsck9.sh.diskimage.20220716T172428.gz + +. ../default.cfg + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 + +cc -o /tmp/flip -Wall -Wextra -O2 ../tools/flip.c || exit 1 + +set -e +u1=$mdstart +u2=$((mdstart + 1)) +mp1=${mntpoint}$u1 +mp2=${mntpoint}$u2 +mkdir -p $mp1 $mp2 +log=$mp1/fsck9.sh.log +diskimage=$mp1/fsck9.sh.diskimage +backup=/tmp/fsck9.sh.diskimage.`date +%Y%m%dT%H%M%S`.gz +cleans=0 +reruns=0 + +max=$((10 * 1024 * 1024)) +newfs_flags='-U' + +mount | grep "on $mp1 " | grep -q /dev/md && umount -f $mp1 +[ -c /dev/md$u1 ] && mdconfig -d -u $u1 +mdconfig -a -t swap -s 1g -u $u1 +newfs $newfs_flags -n /dev/md$u1 > /dev/null +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 +backups=`newfs -N $newfs_flags md$u2 | grep -A1 "super-block backups" | \ + tail -1 | sed 's/,//g'` +newfs $newfs_flags -n md$u2 > /dev/null +mount /dev/md$u2 $mp2 +[ -d /usr/include/sys ] && cp -r /usr/include/sys $mp2 +umount $mp2 +set +e + +chk() { + local i + + clean=0 + rerun=0 + fsck_ffs -fy $1 > $log 2>&1 + r=$? + if grep -qE "Cannot find file system superblock|Superblock check-hash failed" $log; then + for b in $backups; do + fsck_ffs -b $b -fy $1 > $log 2>&1 + r=$? + grep -qE "Cannot find file system superblock|Superblock check-hash failed" $log || + break + done + usedasb=1 + else + usedasb=0 + fi + LANG=C egrep -q "[A-Z][A-Z]" $log && clean=0 + grep -Eq "IS CLEAN|MARKED CLEAN" $log && clean=1 + grep -q RERUN $log && rerun=1 + [ $r -ne 0 -a $clean -eq 1 ] && echo "Exit code $r w/ clean == 1" +} + +cd $mp1 +clean=0 +s=0 +start=`date +%s` +while [ $((`date +%s` - start)) -lt 300 ]; do + mount /dev/md$u2 $mp2 || { s=101; break; } + ls -lR $mp2 > /dev/null || { s=102; echo "ls failed"; break; } + touch $mp2/`jot -rc 8 a z | tr -d '\n'` + while mount | grep -q "on $mp2 "; do umount $mp2; done + echo * | grep -q core && break + sync + mdconfig -d -u $u2 + /tmp/flip -n 5 $diskimage + + sync + if [ `stat -f%z $diskimage` -gt $max ]; then + ls -lh $diskimage + truncate -s $max $diskimage + else + gzip < $diskimage > $backup + fi + fsync $backup + + for i in `jot 5`; do + [ $i -gt 2 ] && echo "fsck run #$i" + chk $diskimage + [ $rerun -eq 1 ] && { reruns=$((reruns + 1)); continue; } + [ $clean -eq 1 ] && { cleans=$((cleans + 1)); break; } + [ -f fsck_ffs.core ] && break 2 + done + if [ $clean -eq 1 ]; then +# echo "Checking clean claim" + fsck_ffs -fy $diskimage > $log 2>&1 + if grep -q MODIFIED $log; then + echo "fsck of "clean" FS found more issues:" + cat $log + s=1 + break + fi + fi + [ $clean -ne 1 ] && break + mdconfig -a -t vnode -f $diskimage -u $u2 +done +sleep 2 # Wait for /dev to catch up +[ -c /dev/md$u2 ] && r1=1 || r1=0 +for i in `jot 5`; do + mount | grep -q "on $mp2 " || break + umount $mp2 && break + sleep 2 +done +mdconfig -d -u $u2 2>/dev/null # XXX when mount fails + +[ $s -eq 0 ] && rm -f $backup +cd /tmp +for i in `jot 5`; do + umount $mp1 && break + sleep 2 +done +mdconfig -d -u $u1 +rm -f /tmp/flip +exit $s