From nobody Fri Aug 19 09:43:02 2022 X-Original-To: dev-commits-src-all@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 4M8GyZ3TxPz4Yb40; Fri, 19 Aug 2022 09:43:02 +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 4M8GyZ33bCz3pV8; Fri, 19 Aug 2022 09:43:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660902182; 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=GzfeB4ee/TJeVN6b3b82DKxDrogmvDE4L9BSNZGSIkQ=; b=O4tmp/mNj5T10zwyO5yAmbXsuyOmBV1BcCNV6+vCQO2kP/5TiXC0J922xW9ztTuCXhLYuZ AgWJ2e2wJ1ARachBzzCS2f4j2waeHSs7nBmGmqlo8CMj8/T3UGOEqOHNEP7xLGo5aZ4KXd Iiep0xBX0uTfJqiT/aVPqSpc56WfL7LUpVGrQsmaFW+NAf/7VnH1iqXJ0hNMr2ygzws/7b 8v8Z/STHjTGuR63dwCheDRAXUfED8NtXck1lvpp4kvPrSkJunBbsKHNkIR+5HNv1RIGu43 z5yYJxAXRXUilRQkEjTCmuAw2gyISM+zE86685sRJ0qhuvfY0+fsOCsFgwhBEA== 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 4M8GyZ27h6zp2Y; Fri, 19 Aug 2022 09:43:02 +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 27J9h2x7098229; Fri, 19 Aug 2022 09:43:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27J9h2ef098228; Fri, 19 Aug 2022 09:43:02 GMT (envelope-from git) Date: Fri, 19 Aug 2022 09:43:02 GMT Message-Id: <202208190943.27J9h2ef098228@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: dd894897691f - main - stress2: Updated tests as a result of the latest updates to fsck_ffs(8) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: dd894897691f88061ed7630ded985bc6f9632e39 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660902182; 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=GzfeB4ee/TJeVN6b3b82DKxDrogmvDE4L9BSNZGSIkQ=; b=iPymYY0ojLiWIuOpXs/wF9CzfY7rL3jUnHRffLBEr8GgrnW7Irk69yjBdAf4bgSKp5PcH3 FzoGnf0mE/WIYG/n06yh7+QVTdvAan1+kBckB5FJxpi91dmpfGphEfXtt4SvXUhPcLElaH F301MgwmdrGp6lxTW8KVTsuRtXtKzA/D35h0Dp/37Mb8fYQgWWAGluNFB804FzN6YRaP9B XbW1+pkF9FbLxRphEHjH4o/9UGlzvqdGu/Fod3H8Je9tUeyqe/6pqj1YTf44aqfDL6CMeW il92l4bJJ/IkGxBN9HW/WqgM6LCsK2nUyk++RcvatxWQy7bvGfY0RVh48Bj78g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660902182; a=rsa-sha256; cv=none; b=XSTkAA4hYrwYQZRPC+8btIhxCeb+cgm1CP5RdpJofIZEOOeT63g8N1Ws2AtAD4EKuQLspH u6QHOmBT/e22uW3PFx9S/QwnTashe82zU+WOn3nId3fJDuCZh5HEb1GS0tT6h9I40yxS1W 8r4FHQFDa8IPsoL9PVuOBFPxrQqgkSs3FfBFUcueAQ/ID1Krb6M4ZnRTdRAF76q7Mda9pb LuwsUzGafOXPFLHBp+bsRjlJy5rU0ywOxpCDgTC//ZDYmPBB1vhdfru56ekSoxcZlXmq4s Jcy3YNLI3ps+VaxBUho3G/Jsm/yJ8rj0yw74/W3nrKhIBAT1+yDJGykTs5zz8w== 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=dd894897691f88061ed7630ded985bc6f9632e39 commit dd894897691f88061ed7630ded985bc6f9632e39 Author: Peter Holm AuthorDate: 2022-08-19 09:40:49 +0000 Commit: Peter Holm CommitDate: 2022-08-19 09:40:49 +0000 stress2: Updated tests as a result of the latest updates to fsck_ffs(8) --- tools/test/stress2/misc/fsck8.sh | 13 +++++++------ tools/test/stress2/misc/fsck9.sh | 24 ++++++++++++++++-------- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/tools/test/stress2/misc/fsck8.sh b/tools/test/stress2/misc/fsck8.sh index 7b2e20bb7d5b..41f03bc3bece 100755 --- a/tools/test/stress2/misc/fsck8.sh +++ b/tools/test/stress2/misc/fsck8.sh @@ -80,15 +80,15 @@ chk() { clean=0 rerun=0 waccess=0 - fsck_ffs -fy $1 > $log 2>&1 + timeout 5m fsck_ffs -fy $1 > $log 2>&1 r=$? - if grep -qE "Cannot find file system superblock|Superblock check-hash failed" $log; then + if grep -qiE "super-?block.*failed" $log; then for b in $backups; do echo "Using alternate SB $b" asbs=$((asbs + 1)) fsck_ffs -b $b -fy $1 > $log 2>&1 r=$? - grep -qE "Cannot find file system superblock|Superblock check-hash failed" $log || + grep -qiE "super-?block.*failed" $log || break done usedasb=1 @@ -110,7 +110,7 @@ clean=0 s=0 start=`date +%s` while [ $((`date +%s` - start)) -lt 300 ]; do - mount /dev/md$u2 $mp2 || { s=101; break; } + mount /dev/md$u2 $mp2 || 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 @@ -128,6 +128,7 @@ while [ $((`date +%s` - start)) -lt 300 ]; do gzip < $diskimage > $backup fi fsync $backup + sync for i in `jot 5`; do [ $i -gt 2 ] && echo "fsck run #$i" @@ -135,7 +136,7 @@ while [ $((`date +%s` - start)) -lt 300 ]; do [ $rerun -eq 1 ] && { reruns=$((reruns + 1)); continue; } [ $clean -eq 1 ] && { cleans=$((cleans + 1)); break; } [ -f fsck_ffs.core ] && - { cp $diskimage \ + { cp -v $diskimage \ /tmp/fsck_ffs.core.diskimage.`date +%Y%m%dT%H%M%S`; break 2; } done [ $clean -ne 1 ] && break @@ -165,7 +166,7 @@ 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; } || +echo * | grep -q core && { ls -l *.core; cp -v $log /tmp; exit 106; } || rm -f $backup [ $s -eq 101 ] && rm -f $backup # mount error breakout cd /tmp diff --git a/tools/test/stress2/misc/fsck9.sh b/tools/test/stress2/misc/fsck9.sh index 0297013839eb..4610e9da1fb8 100755 --- a/tools/test/stress2/misc/fsck9.sh +++ b/tools/test/stress2/misc/fsck9.sh @@ -80,12 +80,14 @@ chk() { rerun=0 fsck_ffs -fy $1 > $log 2>&1 r=$? - if grep -qE "Cannot find file system superblock|Superblock check-hash failed" $log; then + if grep -qiE "super-?block.*failed" $log; then for b in $backups; do + echo "fsck_ffs -b $b -fy $1" fsck_ffs -b $b -fy $1 > $log 2>&1 r=$? - grep -qE "Cannot find file system superblock|Superblock check-hash failed" $log || + grep -qiE "super-?block.*failed" $log || break + echo "Checking next SB" done usedasb=1 else @@ -102,8 +104,12 @@ 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; } + mount /dev/md$u2 $mp2 || break + if ! ls -lR $mp2 > /dev/null; then + s=102 + echo "ls failed"; grep "core dumped" /var/log/messages | tail -1 + break + fi 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 @@ -119,19 +125,21 @@ while [ $((`date +%s` - start)) -lt 300 ]; do gzip < $diskimage > $backup fi fsync $backup + sync 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 + [ -f fsck_ffs.core ] && + { cp -v $diskimage \ + /tmp/fsck_ffs.core.diskimage.`date +%Y%m%dT%H%M%S`; 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:" + echo "*** fsck of \"clean\" FS found more issues:" cat $log s=1 break @@ -149,7 +157,7 @@ for i in `jot 5`; do done mdconfig -d -u $u2 2>/dev/null # XXX when mount fails -[ $s -eq 0 ] && rm -f $backup +[ $s -eq 0 ] && rm -f $backup || echo "Preserved $backup due to status code $s" cd /tmp for i in `jot 5`; do umount $mp1 && break