From nobody Wed Oct 4 13:43:48 2023 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 4S0wrj1wsXz4vy0B; Wed, 4 Oct 2023 13:43:49 +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 4S0wrj1D63z3ZJB; Wed, 4 Oct 2023 13:43:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696427029; 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=DpWBeyxmzn3nVz8tCP84aDVExSsU9SvLp7aatm61g10=; b=mR9h2MPqtm6vnJCx9fVoRSeQe5WySnuubdwj0r0vC/YI3HyCycdbK+s1dlHHWc75X9j8c5 1m3wClObHb2AvnTz43zmDQkeEYHVHwWzyXiSrn3Af9sBKcLt2HEz/N6ogoLskbdJRbvx2T yFjlUG1yzLyxuqReBBvnleIDd/fM41NSq2NbjLD7ez1u4n+lInyG1Tpj0XHNE0VCdLgjry eyHwhdmvHTy7PvfhM7ExpWFXpeEmYrCCJLwDKsMRRSpakqBXjNqEE91rdgqa2jad+XqPNK Txwcx1NEdhwrieVQDXoK6BXmU/V17OxJhciQbC67z5WjEdr8/LcUOfMEPOu8YQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696427029; a=rsa-sha256; cv=none; b=gUMu0UbccddAy8H6Dti6wkogSnunDZAvNq+30HbEci3Au5qEyMp++Shll54vevYQIZPGQW /9x0qUqKDdvZshFlgZk9dbCiirXcxOt187pe8+Hkxnyp4JAFmegjR0bhJHmrDzyT34J6dq 8wC9W88iV1sK9SYM2N2Y/4sVCGW7HG5UaxBTZhNqpEqKuJ2VnIEWF7PPeazZUcn6gg+0rI PsZNJ1MmXNpuTTIqa+vJOuCWodGz8GB8TJfVpVWir3xINKOb0OZfTJqOY8rXwRQ7VllVEV 2jWDhBu5kKTJDMFupO+TXJIwzrDhlgdbypvkdeY4MeznMKtNBhAKzfG2L2+RUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696427029; 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=DpWBeyxmzn3nVz8tCP84aDVExSsU9SvLp7aatm61g10=; b=O1bdjnTBsFNawWaYmsAdQGXgVCcBZjJovMuFQiZzT+dff8oYNruUitwyiW3ak5wTfu8dkA f6S+eUxeuzlCklp04FD77nuMxOpikR79cetPw3hH8zz5/Rffd1dpXH5Rvu7IqjhwEDA4ot OAr3XHDPW1p6cZDah/BtiDFRfulftEYHD6DI8NEHmaflRf0YKR5JSb4O0MV/gt/76vxoaC K9loN604glnes541AjDuVDcxnVQpXdVPrSvcV4CICPEkrDWsmM2xU4mxYb7GjdSYllRoNn Z+j4v4w8x0FWmtKLlz+ynfUc4rvBHj3UahHtb6IksxI4Ho30KPGpYBP/W+R2IA== 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 4S0wrj0DggzfYT; Wed, 4 Oct 2023 13:43:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 394Dhmqb020110; Wed, 4 Oct 2023 13:43:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 394Dhmte020107; Wed, 4 Oct 2023 13:43:48 GMT (envelope-from git) Date: Wed, 4 Oct 2023 13:43:48 GMT Message-Id: <202310041343.394Dhmte020107@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: d4a5d7a15544 - stable/14 - makefs/zfs tests: Run zdb prior to importing makefs-created pools 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d4a5d7a15544d5e561f4235b9b40457e2c52626a Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d4a5d7a15544d5e561f4235b9b40457e2c52626a commit d4a5d7a15544d5e561f4235b9b40457e2c52626a Author: Mark Johnston AuthorDate: 2023-09-27 15:58:34 +0000 Commit: Mark Johnston CommitDate: 2023-10-04 13:42:07 +0000 makefs/zfs tests: Run zdb prior to importing makefs-created pools zdb contains quite a few assertions that can help catch bugs. MFC after: 1 week Sponsored by: The FreeBSD Foundation (cherry picked from commit 87534f95dd2ed51e01165e0072cb1c7790809a8b) --- usr.sbin/makefs/tests/makefs_zfs_tests.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.sbin/makefs/tests/makefs_zfs_tests.sh b/usr.sbin/makefs/tests/makefs_zfs_tests.sh index 250a313481d9..e8da4cc87055 100644 --- a/usr.sbin/makefs/tests/makefs_zfs_tests.sh +++ b/usr.sbin/makefs/tests/makefs_zfs_tests.sh @@ -56,6 +56,8 @@ import_image() { atf_check -e empty -o save:$TEST_MD_DEVICE_FILE -s exit:0 \ mdconfig -a -f $TEST_IMAGE + atf_check -o ignore -e empty -s exit:0 \ + zdb -e -p /dev/$(cat $TEST_MD_DEVICE_FILE) -mmm -ddddd $ZFS_POOL_NAME atf_check zpool import -R $TEST_MOUNT_DIR $ZFS_POOL_NAME echo "$ZFS_POOL_NAME" > $TEST_ZFS_POOL_NAME }