From nobody Thu Jun 30 07:47:10 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 A14AC87F8CE; Thu, 30 Jun 2022 07:47:10 +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 4LYVly48HYz3k4q; Thu, 30 Jun 2022 07:47:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656575230; 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=fCjtktmsGXptdkXf39CR+sF9m1ztD6NngKqjhupXbJE=; b=d/3TcSugDu5/33e/J2pm6VvUHKFXrIkPXfXIXk3fMAugMSEyUXWUZJIkqBN+J54TLwokk+ tUUL0H0Xx10OCTh33PhujBUPzcoi9J68GoBDCqKU4IPD5HkNBCQICflyMosiM2zLUqQc/H HUBmtQ31Oum5ieXfepo0SjZdudBMJ7+8OrhTDuwq8g/3Br9fa0JxWujMWcHnjaTybdEfPB jWdXSedb/GTCetw/rmJTlJxX7UprVz8JeqYhlJRCick2bccK4MzPO7rHLvrnXzXNWR6jI7 5ZZoxx0KbjBShLBnzevfkpfr+lWrwgv6uVRNLV99puzHc/x0fDmhn1a+CMFXdQ== 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 6478921F60; Thu, 30 Jun 2022 07:47:10 +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 25U7lANH024389; Thu, 30 Jun 2022 07:47:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25U7lAlM024388; Thu, 30 Jun 2022 07:47:10 GMT (envelope-from git) Date: Thu, 30 Jun 2022 07:47:10 GMT Message-Id: <202206300747.25U7lAlM024388@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: ec8c9e7ac3fd - main - stress2: Rework test to improve error reporting 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: ec8c9e7ac3fd82fc7f94847a1c97da38e3306acf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656575230; 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=fCjtktmsGXptdkXf39CR+sF9m1ztD6NngKqjhupXbJE=; b=Ekg7Xa1DBLGVGyByOUczDmuLQM4b2Y4JRws4tHhMaKIpFYMRN5b/mrMWOayRL0GWTDrHfr 6YxkKfxr4A/4bIUQmjV98SOHvgzHXYpJFn83iauS5rtz/hKSyA3DVxQrBP4C4Y8XXsWwC5 Xeik/ePn9D2LMWroY8hDMzpjWDIiC2coqoFimq9heuyUsvpXZp0AEQU0wNdbYRBOWDBheZ /mPRtijUsDaglQiZ7DBmZdN+eDttEfttGpXDtBjPisw0X3NksKa4oGeth+qktKM896nCQQ 1msXWeFkKhCwi9f/ozc9DSGYnDRkE9lejhKAAuEXV3gR5p/JOJJSUjpY9OunIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656575230; a=rsa-sha256; cv=none; b=dqVTu+9QTRdUwtXXnNV1Yt6pnW2WPkeYxuKfpu3iDtd2zBt3rCUh8AV96x1o6liZFWzbcf GYKIMxVGoBHG497adkjaJcI68QiRJ3JA9Tcx1Z0K8Kf0U2yQLxZ+aVyeyOluJMzFBDoyZ1 zlbTEqt1oFg5On7oDaKSGxmj3IIbnWWJkgLZBgiph3CX4Kp5Z8z4i+igVnydbhBEN/6+78 qKtsayRySTTZIuvPdwr9PmnjqWaRS54bRoR/jD0xMLTesHIgG6o+NtwFJUg+rvpDrUWEGd /QkJC6lSqXusELhRyGjXdRHC8kUlm+ra/kBflrLFIWEcOgG/a9oNJ/G9cqb6Lg== 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=ec8c9e7ac3fd82fc7f94847a1c97da38e3306acf commit ec8c9e7ac3fd82fc7f94847a1c97da38e3306acf Author: Peter Holm AuthorDate: 2022-06-30 07:46:26 +0000 Commit: Peter Holm CommitDate: 2022-06-30 07:46:26 +0000 stress2: Rework test to improve error reporting --- tools/test/stress2/misc/newfs.sh | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/tools/test/stress2/misc/newfs.sh b/tools/test/stress2/misc/newfs.sh index d953cc669bb9..44c76f78b599 100755 --- a/tools/test/stress2/misc/newfs.sh +++ b/tools/test/stress2/misc/newfs.sh @@ -41,27 +41,26 @@ mount | grep "$mntpoint" | grep md$mdstart > /dev/null && umount $mntpoint mdconfig -l | grep md$mdstart > /dev/null && mdconfig -d -u $mdstart -mdconfig -a -t swap -s 1g -u $mdstart +mdconfig -a -t swap -s 20g -u $mdstart -echo "Expect warnings from SU and SU+J." log=/tmp/newfs.sh.log s=0 export RUNDIR=$mntpoint/stressX -export runRUNTIME=10s +export runRUNTIME=15s export RUNTIME=$runRUNTIME export CTRLDIR=$mntpoint/stressX.control start=`date '+%s'` for opt in -O1 -O2 -U -j; do - echo "Testing newfs with option $opt." blocksize=4096 while [ $blocksize -le 65536 ]; do for i in 8 4 2 1; do fragsize=$((blocksize / i)) + echo "newfs $opt -b $blocksize -f $fragsize"\ + "md$mdstart" newfs $opt -b $blocksize -f $fragsize \ - md$mdstart > /dev/null 2>&1 || continue - mount /dev/md$mdstart $mntpoint + md$mdstart > /dev/null || { s=1; continue; } + mount /dev/md$mdstart $mntpoint || { s=2; continue; } chmod 777 $mntpoint - rm -rf /tmp/stressX.control su $testuser -c \ "(cd ..; ./run.sh disk.cfg > /dev/null 2>&1)" & sleep 10 @@ -71,20 +70,17 @@ for opt in -O1 -O2 -U -j; do grep -q md$mdstart; do umount $mntpoint > /dev/null 2>&1 || sleep 1 done - checkfs /dev/md$mdstart > $log 2>&1 || { - cmd="newfs $opt -b $blocksize -f $fragsize" -# if ! grep -q -- "$cmd" $0; then - s=1 - echo "$cmd" - cat $log -# fi + fsck -fy /dev/md$mdstart > $log 2>&1 + grep -q "WAS MODIFIED" $log && { + s=3 + cat $log } done blocksize=$((blocksize * 2)) done if [ $((`date '+%s'` - start)) -gt 1200 ]; then echo "Timed out" - s=1 + s=4 break fi done