From nobody Mon Jul 21 14:58:19 2025 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 4bm3Rw5R0zz62lDK; Mon, 21 Jul 2025 14:58: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bm3Rv4vZCz3P5X; Mon, 21 Jul 2025 14:58:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753109899; 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=nqiqOBe6Qxj4gf3sBvSq2FPZTOhTPs0kweXInbP7b/c=; b=My2L1i8OQBmBpXKqy+1w0He1+P3jSWg3RvXbbTD9RgEKPL13D4KV+LrqHwCfQu2OIEZSuE P6ponAFj7N4myMUR2wCFc3aWd2ry37HSNYBg+jiM8/PsoIeDEVfXxj5uNOpnWvLJfkkndI oa+fQS8RVcHybUT2t8v5hB3VThX7FlqWh+pPaFNqjxin58BLvPYN3FzFzvkGjkL7rWy5QB 9dEJr2l3DJeaDkEzt/mTbJbzWBZKILWHWmHiHjY+PhN3lJzywzoezL2Ckuu8L0kyIhbvWG ES+wrbSe87ExJ8TnI8yETS3LehB38QhUe+3i8hv6j+W09VJdYzt4MyyOpGAxPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753109899; 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=nqiqOBe6Qxj4gf3sBvSq2FPZTOhTPs0kweXInbP7b/c=; b=Ssp+RZCoM1DF5rQgRgGiizTHsYxhWex7UZ5GRVBKjWbCkO1N7Lw1IBAm+yy/Vsek8qs8h2 sPl2fiLlxQ/e7f7CanPLEWzNyhhATv7VtxwRTrRfzJxXaLgWYvVVfnvfOS/z5/Qu5zBnf5 cC54XkO1cT47W2Hf0p3yovUTPBw5c6IZWU1HbsqjXB1+HnEfXC33hDTUtRrdWiszUfpo4N EmmdyYi3nhqzqdKQe+KjPFY5Y72Ky774Z40eNTyabwXX7mZBfitPQPAvl3mdzT6vK5xueW VFrHLZvSm38kWFRf58pIJrfiGlZp26ayQ3wqnCfQ8DINeK5jptR1xGibdbIjZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753109899; a=rsa-sha256; cv=none; b=IERgDTMJAOSrrO/0xysXTrvmEXQh6HFsRwxXEgnspO/ys9aAaxwatVrcR3xYfcgA0Jo2wA qYpPo6cug92ev68/ud5IJJ05cGxlGTPgFzUbxssGO0NWlQ61NnGRBuFZ6EnRmRrqjy74sz C3npOmQBf4FOaYmbP1N9ygj1OvLIsffIS/pFlfmfQTqNb8EiaFkUntRnMCMLx4T6JVc9D9 Q1SVXEoYZCzfWy8bA3JBEnGXipgWpQgZgc1Tf6yKOTF7MfCULwQRPNtohaJbYNKpsFcGvg FWg/VjUYvtD/XPil2vY+iUtygdCvqlIvQGdmlJjsehnZRIA0qS0S7/xpsOHNkg== 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 4bm3Rv3xMKz12Jl; Mon, 21 Jul 2025 14:58:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56LEwJPY053958; Mon, 21 Jul 2025 14:58:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56LEwJ2b053955; Mon, 21 Jul 2025 14:58:19 GMT (envelope-from git) Date: Mon, 21 Jul 2025 14:58:19 GMT Message-Id: <202507211458.56LEwJ2b053955@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 68dc9c6b8ef8 - main - makefs/zfs tests: Run in parallel 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 68dc9c6b8ef86caef3962cc9177bb21d8f38b0ed Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=68dc9c6b8ef86caef3962cc9177bb21d8f38b0ed commit 68dc9c6b8ef86caef3962cc9177bb21d8f38b0ed Author: Mark Johnston AuthorDate: 2025-07-21 13:41:56 +0000 Commit: Mark Johnston CommitDate: 2025-07-21 14:57:58 +0000 makefs/zfs tests: Run in parallel Use the script PID as a pool GUID. This way, tests running in parallel will have pool GUIDs that won't collide, and the tests no longer need to be serialized. MFC after: 1 month --- usr.sbin/makefs/tests/Makefile | 4 ---- usr.sbin/makefs/tests/makefs_zfs_tests.sh | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/usr.sbin/makefs/tests/Makefile b/usr.sbin/makefs/tests/Makefile index 345b728651d6..748bafa06211 100644 --- a/usr.sbin/makefs/tests/Makefile +++ b/usr.sbin/makefs/tests/Makefile @@ -7,10 +7,6 @@ ATF_TESTS_SH+= makefs_msdos_tests TEST_METADATA.makefs_msdos_tests+= required_files="/sbin/mount_msdosfs" .if ${MK_ZFS} != "no" ATF_TESTS_SH+= makefs_zfs_tests -# ZFS pools created by makefs always have the same GUID, so OpenZFS -# refuses to import more than one at a time. Thus the ZFS tests cannot -# be run in parallel for now. -TEST_METADATA.makefs_zfs_tests+= is_exclusive="true" .endif BINDIR= ${TESTSDIR} diff --git a/usr.sbin/makefs/tests/makefs_zfs_tests.sh b/usr.sbin/makefs/tests/makefs_zfs_tests.sh index d73da083a8c2..2fafce85b347 100644 --- a/usr.sbin/makefs/tests/makefs_zfs_tests.sh +++ b/usr.sbin/makefs/tests/makefs_zfs_tests.sh @@ -28,7 +28,7 @@ # SUCH DAMAGE. # -MAKEFS="makefs -t zfs -o verify-txgs=true" +MAKEFS="makefs -t zfs -o verify-txgs=true -o poolguid=$$" ZFS_POOL_NAME="makefstest$$" TEST_ZFS_POOL_NAME="$TMPDIR/poolname"