From nobody Mon Aug 25 15:22:58 2025 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 4c9ZLC54Zgz65vkR; Mon, 25 Aug 2025 15:22:59 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c9ZLC2qgxz3Xyq; Mon, 25 Aug 2025 15:22:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756135379; 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=pVpHUFSkswVnX4MtmeeJ7M4SijOzlxzCVbPFDBLXFpk=; b=vWFhWI2FbCjTQ9QeZLBBDigtiDOZ0mTHATdms65ykV+ULxO5fb4RhByK2KDldisQRu1ZVG WWdlqHkLM65jluthapHhfmqMJzXAmHXcq8Tvl6xzumWGCZvvsNOrmfXPn4NfDZQhhBdIiq 0onXzCrk0CPbG2APN/4fvnVJan8q9A+Hfo5cgYr8V/ZWg8VAe9fLPMj6G4HtTM+sLZEL2C DLWAd9E6S9d/ifgD8hwRkgHxnqx90BCxap8+ht0J2ZGZE79aqI1V8KRNPSdn1XaYP25UFY AX+9UueXikLRNHbgFUap9NVUJgw1euR7TF3CyXnZpb/mMi4xTbbA1CLvuHnxHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756135379; 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=pVpHUFSkswVnX4MtmeeJ7M4SijOzlxzCVbPFDBLXFpk=; b=XHWbuA/+8XNkTILnSl2srK1Up49anzl/P9/OaeHY4onZNgB6H++6RzfOIKMHYdbyzZMtJo vP1RYLHcZuKD62NkhuuinoPJd/xAg9NUvL6gahjPSE9HKZRIxLHGaQrZgZRduAsLNSzW2n cGTnJjtDa5kwrqRyIs6gQO5ERpRUqsBDwBC9dvrJk9CkRCTPo4pOjAyuaykF7D5DN26cV7 6Hj0htuMWrEX8nrB9/LMC5S7PHBgig7sdJT1EjpIdIeqxjjM6XE52uHFcWG42wl6qFfiiq 0RoKUGajBNzGa+m3p2nJa7EUxmL2ZORR6CV90YKw5aOTx9YrEh3sTOIYyk1jew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756135379; a=rsa-sha256; cv=none; b=RDcxjz54c3JCev4uecLFInhHm4ynSaCG6LuGMsn8J43INfY3HTJQfSI1c/AREUqg0nGgUH R5OuUZB4Ij0m4PneAZA/Tnd6w+t54YJGLQk7lvpJGofCarNFyFvID/QUJ3OzQp7wRhaqzw UoHmpmVSqR6VLPn2sdbcwPjkekQ/hBYByaOUYppKIAYTRkCS/DTLNiKeyySjX2t9YWSpVi HmVIonoGNlsewawd8xYhD6C8FLmqSMmqmVi7sZArdpEiZ0ZclIsRIum8gFnDoOUM07qmMi Fx49x5jsG0g94jg7O8Kx8wzHbU6LtJKgqrpT3KpPr5YLwH13M3fQVFTmY7/hvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c9ZLC09Lnzvh6; Mon, 25 Aug 2025 15:22:59 +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 57PFMwI5054173; Mon, 25 Aug 2025 15:22:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57PFMwHP054170; Mon, 25 Aug 2025 15:22:58 GMT (envelope-from git) Date: Mon, 25 Aug 2025 15:22:58 GMT Message-Id: <202508251522.57PFMwHP054170@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: b681da5c8d8b - stable/14 - makefs/zfs: Allow the user to specify the pool GUID 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: b681da5c8d8b8bfac0a91401545776fe8f1919ae Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b681da5c8d8b8bfac0a91401545776fe8f1919ae commit b681da5c8d8b8bfac0a91401545776fe8f1919ae Author: Mark Johnston AuthorDate: 2025-07-21 13:41:40 +0000 Commit: Mark Johnston CommitDate: 2025-08-25 13:57:57 +0000 makefs/zfs: Allow the user to specify the pool GUID This will be used by the test suite to enable running makefs/zfs tests in parallel. MFC after: 1 month (cherry picked from commit cd4b9dac1a0dc6b868aa4376ac355aaf25430a77) --- usr.sbin/makefs/makefs.8 | 6 ++++++ usr.sbin/makefs/zfs.c | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/usr.sbin/makefs/makefs.8 b/usr.sbin/makefs/makefs.8 index bc6cf8e5e2d9..d3b7c9c3e519 100644 --- a/usr.sbin/makefs/makefs.8 +++ b/usr.sbin/makefs/makefs.8 @@ -550,6 +550,12 @@ This option allows the default heuristic to be overridden. .It verify-txgs Prompt OpenZFS to verify pool metadata during import. This is disabled by default as it may significantly increase import times. +.It poolguid +Use the specified 64-bit integer as the pool GUID. +If this option is not specified, the pool GUID will be random but fixed +across multiple identical invocations of +.Nm . +This option is useful for testing but not required for reproducibility. .It poolname The name of the ZFS pool. This option must be specified. diff --git a/usr.sbin/makefs/zfs.c b/usr.sbin/makefs/zfs.c index 66e7f8dafc9c..8d50c450541b 100644 --- a/usr.sbin/makefs/zfs.c +++ b/usr.sbin/makefs/zfs.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -85,6 +86,8 @@ zfs_prep_opts(fsinfo_t *fsopts) 0, 0, "Bootable dataset" }, { '\0', "mssize", &zfs->mssize, OPT_INT64, MINMSSIZE, MAXMSSIZE, "Metaslab size" }, + { '\0', "poolguid", &zfs->poolguid, OPT_INT64, + 0, INT64_MAX, "ZFS pool GUID" }, { '\0', "poolname", &zfs->poolname, OPT_STRPTR, 0, 0, "ZFS pool name" }, { '\0', "rootpath", &zfs->rootpath, OPT_STRPTR, @@ -547,7 +550,8 @@ pool_init(zfs_opt_t *zfs) { uint64_t dnid; - zfs->poolguid = randomguid(); + if (zfs->poolguid == 0) + zfs->poolguid = randomguid(); zfs->vdevguid = randomguid(); zfs->mos = objset_alloc(zfs, DMU_OST_META);