From nobody Fri Jul 15 08:20:27 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 4LkknR64hWz4T2lf; Fri, 15 Jul 2022 08:20:27 +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 4LkknR5Vkcz3T9D; Fri, 15 Jul 2022 08:20:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657873227; 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=p+q/1Gn4+LCjk8WMA8PiXUBp4K6P3rwN0G2hxnfJ30Y=; b=fO9TXWUG/whYFQi8uPcNIZ/O5TlYTaIu9dioZ1OhSmYt33Q+x3RV3JGQhxfQ1amcNufhhG 7O7lAAOIS1FZrG3L8AnoUotv2bPbvPM52hJG/Q3abAZWdW5hNqrCChewpD73pEcP3/eBst buVt+J0CwfVxB14ApExGiZJXBaBSr+Q9kV/KNfYAWuTptp0bPifN1rBcQ5Hd3UrxTGF1Nv 1uE3UadJJn76Ng3neH3GKNgZm7MtHvluKZE6BzaiOGpZ2WdXj9VpkiKQxiwQEB9V2tiU94 wnknfDXrCpQOXK2wImQ2G8R8EZQpgf93d+KDbXA36hMDDIZZYMxROabupdQJew== 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 4LkknR4XXZzbGH; Fri, 15 Jul 2022 08:20:27 +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 26F8KRxP070382; Fri, 15 Jul 2022 08:20:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26F8KRgn070381; Fri, 15 Jul 2022 08:20:27 GMT (envelope-from git) Date: Fri, 15 Jul 2022 08:20:27 GMT Message-Id: <202207150820.26F8KRgn070381@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: b4a666180180 - main - stress2: Handle "gunion create" error exit 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: b4a666180180719272e16d9bfade5b7fc500b6be Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657873227; 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=p+q/1Gn4+LCjk8WMA8PiXUBp4K6P3rwN0G2hxnfJ30Y=; b=fj8XNOT8oZpD8t4Abexe42OPDDD4jlJpW5omWD4+rle6k9lDFa9o2FTJ8MhO9bJo69jhj3 XM+u/Fn3/2+GWLnuFYAqVJ6y9AXUHgjIzxPv7VvhTr4/ljJUaGthzxBTZrwJAzCdVJCizp YwX7TFFfiddB61V4G3SuUT2fin47yyWTX/AlJ8GoLtSUZJ/jaNvt1oeDicnY4+qJ7REef1 F9VD0I24rxRYz3PsApTv7ntdeuGMG+7XA1HvgyuZUwgNEnWzQE6UP0jtDbkCfCaxDKw376 JjWDZXs9IXJtTfGaFIqUfeB/C3HLf74fe5aJwwM8EUHTs3HfoIALugPvScjOFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657873227; a=rsa-sha256; cv=none; b=tGm2R5tU3+i5nBEMKFSBlMntu5u3RtB4qJLkLVaVMRaMtZbwRIml/VfewfITZ5KGXG5X3U F+g97E8+XITB7xf/u9WAh+TBfQZkD5S4wPfKvZKcOTJ21Dcbza6vUsSe896Mff5u6wH1xF gygjpeJPP+MzimPXltPJjdpOiOGXlreZFFb4jYWycXPfUIPGqtgD3vzHEp5CHztOeMtxt4 EDfv8BL7sHXvW+7cUOvFmMVjLZAo476g04c5AQwvy2+ojbllz1HUbtZ5zYrfkKN/fZbain S+B5YjpObcoodY9H+7VA+1zkz9JiX1b+HkRp3ECHefjEZ0cC72H++t1oVYCNaQ== 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=b4a666180180719272e16d9bfade5b7fc500b6be commit b4a666180180719272e16d9bfade5b7fc500b6be Author: Peter Holm AuthorDate: 2022-07-15 08:17:23 +0000 Commit: Peter Holm CommitDate: 2022-07-15 08:17:23 +0000 stress2: Handle "gunion create" error exit --- tools/test/stress2/misc/gunion.sh | 7 +++++-- tools/test/stress2/misc/gunion2.sh | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/test/stress2/misc/gunion.sh b/tools/test/stress2/misc/gunion.sh index c7d376e5409e..e72979f2a39a 100755 --- a/tools/test/stress2/misc/gunion.sh +++ b/tools/test/stress2/misc/gunion.sh @@ -50,7 +50,10 @@ cp -r ../../stress2 $mp1 umount $mp1 mdconfig -a -t swap -s 5g -u $md2 -gunion create -v /dev/md$md2 /dev/md$md1 +set +e +gunion create -v /dev/md$md2 /dev/md$md1; s=$? +[ $s -ne 0 ] && echo "gunion create returned $s" +set -e mount /dev/md$md2-md$md1.union $mntpoint export RUNDIR=$mntpoint/stressX @@ -71,7 +74,7 @@ for i in `jot 6`; do done fsck_ffs -fyR /dev/md$md2-md$md1.union > $log 2>&1 grep -Eq "IS CLEAN|MARKED CLEAN" $log || { s=2; cat $log; } -set +e +set -e gunion commit /dev/md$md2-md$md1.union gunion list | egrep Block\|Current | egrep -v 0 && s=3 gunion destroy /dev/md$md2-md$md1.union diff --git a/tools/test/stress2/misc/gunion2.sh b/tools/test/stress2/misc/gunion2.sh index a8fe180c48af..2fa7fc451963 100755 --- a/tools/test/stress2/misc/gunion2.sh +++ b/tools/test/stress2/misc/gunion2.sh @@ -50,7 +50,10 @@ cp -r ../../stress2 $mp1 umount $mp1 mdconfig -a -t swap -s 5g -u $md2 -gunion create -v /dev/md$md2 /dev/md$md1 +set +e +gunion create -v /dev/md$md2 /dev/md$md1; s=$? +[ $s -ne 0 ] && echo "gunion create returned $s" +set -e mount /dev/md$md2-md$md1.union $mntpoint export CTRLDIR=$mntpoint/stressX.control @@ -79,7 +82,7 @@ testcases/swap/swap " export TESTPROGS=`echo $TESTPROGS | sed 's/\n/ /g'` -set +e +set -e chmod 777 $mntpoint su $testuser -c \ "(cd $mntpoint/stress2; ./testcases/run/run $TESTPROGS)"