From nobody Wed Mar 22 09:06:20 2023 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 4PhMz05MhBz40KWY; Wed, 22 Mar 2023 09:06:20 +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 4PhMz04xG9z4Dpb; Wed, 22 Mar 2023 09:06:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679475980; 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=Z086XwGgDIOY8TnMUcLjr31Gl7Y3aTQw9A/TqN6rQ8c=; b=f7eBkmiZ4ndDds8ICyJjvHgwsTgkAjmvPm7CAtznAH3Z0VZRFRVA/hOwFd1GJ1RyowW7ni m1Ew95y11P83KE6fmfqytNMRYM6R0rYJ/05eZhYBmEPnp0WZ+enExxB4A0CfMVgGxtZzBR f/V99F3VpXoID6gAiR6b7Uf61jYolqXGuChHDI5zqR9pw1+HxlhMdLWjVauMkxz1NwcOhR GyY37nIjKQ9+HJqSJNBkEapFtHVP66+UGSrj/ndiAw91eiW0ghHDR8bhlx83Z36Hy5fhr/ /6oUwl4/BC1Cr7z1/GPCbJM4D+4mbF5pyhPznRgmRdIr46MrnA1JrokhnIkRUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679475980; 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=Z086XwGgDIOY8TnMUcLjr31Gl7Y3aTQw9A/TqN6rQ8c=; b=K58DFAqpAjbLzCUEN+MEo6lavfsHRcVj4ln7l70esq/HVJbE3AuMaHrbpcqmxlWLZWdihq wsAlklwO7g/XcsElr1pm9Dx8AciDEgrsOye2MISHenZQAFpqJ/zroZrm5NxsWJe98afo/c qgPYa8f7qgw38EyEkj12xg6ZvULwCACIquYK7rYAVwNqxuVT7RpWylWGoldAPgP3tmsjoz PnsdLlHfzA59HSqQAr/vJ/jg37tTbqo8ynxTZ5/jZBcfKwy3tNoZv3lfebTNdAPdKDcIIq q1mCVvmiFFnreA5eHlhpaDhL4EkKOQSHqEOR8axWLCW5/tTmiRK1dYRA8d5Nxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679475980; a=rsa-sha256; cv=none; b=vM9OzchgVNjlBYV6DmRCsLgc1boZ69mrcSXEhaRb2SVMkj//VMVjL2PqqsY+Ab8mQM/t5o fJoXZoSAP/Zt2Keuvp5JdvMlniblTmwFJXBiwhLV7In0KNkjob6UyNvn6LvZJQDhw2F8PW AViL0J1UvueJtBAEynyN3I9Of3Y46cEf3p0iHEvlPpyZF80VqGX7vblsDLtNlJ1ULvjs0u vQ1zczS2XVt4jLjXAEArbwHPphxJ15LCvSfuz37v1Ac9aAJgeTiBTdxCL072uGXIrHJVn1 0Xo9fwN5cpQABNKO5waGofPuMTL6kYuAHFnwGtRKX9GG9hx/iPpqHrVN8xUHqg== 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 4PhMz043N2znJd; Wed, 22 Mar 2023 09:06: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 32M96Kk1086672; Wed, 22 Mar 2023 09:06:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32M96K3G086671; Wed, 22 Mar 2023 09:06:20 GMT (envelope-from git) Date: Wed, 22 Mar 2023 09:06:20 GMT Message-Id: <202303220906.32M96K3G086671@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: bb1f64b200b5 - main - stress2: Fix syntax error. Remove redundant backup 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: bb1f64b200b59672059088c0ed369b3225f2632e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=bb1f64b200b59672059088c0ed369b3225f2632e commit bb1f64b200b59672059088c0ed369b3225f2632e Author: Peter Holm AuthorDate: 2023-03-22 09:05:46 +0000 Commit: Peter Holm CommitDate: 2023-03-22 09:05:46 +0000 stress2: Fix syntax error. Remove redundant backup --- tools/test/stress2/misc/fsck11.sh | 4 ++-- tools/test/stress2/misc/fsck12.sh | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/tools/test/stress2/misc/fsck11.sh b/tools/test/stress2/misc/fsck11.sh index cb5d1d256be6..8019cc1f2656 100755 --- a/tools/test/stress2/misc/fsck11.sh +++ b/tools/test/stress2/misc/fsck11.sh @@ -56,7 +56,7 @@ reruns=0 newfs_flags=$(echo "" "-U" "-O1" | awk -v N=`jot -r 1 1 3` '{print $N}') [ $# -eq 1 ] && newfs_flags="$1" # or use script argument max=$((2 * 1024 * 1024)) -[ "$newfs_flags" == "-j" ] && max=$((20 * 1024 * 1024)) # Make room for the journal file +[ "$newfs_flags" = "-j" ] && max=$((20 * 1024 * 1024)) # Make room for the journal file mount | grep "on $mp1 " | grep -q /dev/md && umount -f $mp1 [ -c /dev/md$u1 ] && mdconfig -d -u $u1 @@ -135,7 +135,7 @@ while [ $((`date +%s` - start)) -lt 300 ]; do fsync $backup sync; sleep 1 - [ $newfs_flags == "-j" ] && + [ "$newfs_flags" = "-j" ] && fsck -fy $diskimage > $log 2>&1 # process the journal file for i in `jot 5`; do [ $i -gt 2 ] && echo "fsck run #$i" diff --git a/tools/test/stress2/misc/fsck12.sh b/tools/test/stress2/misc/fsck12.sh index d2787e962927..da4629991705 100755 --- a/tools/test/stress2/misc/fsck12.sh +++ b/tools/test/stress2/misc/fsck12.sh @@ -60,7 +60,7 @@ mount /dev/md$u1 $mp1 newfs_flags='-j' [ $# -eq 1 ] && newfs_flags="$1" # or use script argument max=$((2 * 1024 * 1024)) -[ "$newfs_flags" == "-j" ] && max=$((20 * 1024 * 1024)) # Make room for the journal file +[ "$newfs_flags" = "-j" ] && max=$((20 * 1024 * 1024)) # Make room for the journal file [ -c /dev/md$u2 ] && mdconfig -d -u $u2 dd if=/dev/zero of=$diskimage bs=$max count=1 status=none @@ -141,7 +141,7 @@ while [ $((`date +%s` - start)) -lt 300 ]; do fsync $backup sync; sleep 1 - [ $newfs_flags == "-j" ] && + [ $newfs_flags = "-j" ] && fsck -fy $diskimage > $log 2>&1 # process the journal file for i in `jot 5`; do [ $i -gt 2 ] && echo "fsck run #$i" @@ -150,9 +150,7 @@ while [ $((`date +%s` - start)) -lt 300 ]; do grep -q "MODIFIED" $log && continue # For now, do not trust CLEAN [ $clean -eq 1 ] && { cleans=$((cleans + 1)); break; } if [ -f fsck_ffs.core ]; then - tstamp=`date +%Y%m%dT%H%M%S` - gzip < $backup > /tmp/fsck_ffs.core.diskimage.$tstamp.gz - gzip < fsck_ffs.core > /tmp/fsck_ffs.core.$tstamp.gz + s=1 break 2 fi done