From nobody Wed Sep 27 16:00:52 2023 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 4RwhD45p14z4vcb7; Wed, 27 Sep 2023 16:00:52 +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 4RwhD45MPRz3Lcn; Wed, 27 Sep 2023 16:00:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695830452; 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=0MEYVDR6ZsyYsNIojoUoIVNocjh/y9PXhwCr4ykUQ14=; b=UBcbjqYl26BXOIokXroneIGhojZfjXOJ/L/Wy7jfHp04JDzdUTAESflY6L4PtWiuiUbemb THU6ot6QuipkB22nLV3mCEBMNYqsKOnMODURr1ZbSvq5lNewruIb04WVmSli3wyXrSiEAB RxLBsFqORhfWlphbomqBh1KeVNPeqJVLWhms61Z1V7Bk3Cmmq1Han78+46LLZsw2f4OOe+ nlur48HB8aTWnPY3MOpeQSw0D/CU/VqtSMGBD4+U34fwZfQAux3R8GagJB1FVhicZgVyur E2fXjn3E0Sv8C6bavZCXU1qngdzVu8n0+E59pOJItBc2hQ3yIzldCP89+QQtxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695830452; a=rsa-sha256; cv=none; b=O/9Sxfcx3zkle0SI6AhMxJYY5L80YXVKg2FAkleKUnHr7M+krTPdo6lBdzrCohgN4JlzYP Ng9ZH9E87tQE5OhGUNaZxKDlQJjY5PEBxEWPyr8aLWsoaW2LN11VkqAZ/NGstzPUd+sRuf iWycdKDOqkAbu+jt66PaEJVF0vpM6qd8yBiKEnkA6T9FbvXfzVqbcav0iJQkUSKkEEADj4 eD0LU329lYwDP7hTC1UNWVPb2fRFpErQFaiBN9umyziEJ2TkCj5mhJ+e4K98aFMmgM5Wue 2908836s6KFfyAhvmuvQwPT3zhS9xV5kyDZs21ck6eZlisueurZP3fS90L+gPg== 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=1695830452; 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=0MEYVDR6ZsyYsNIojoUoIVNocjh/y9PXhwCr4ykUQ14=; b=SPxmVOlEysUiyVbDRyOMsBgH+seIKPKix82AySX9Nk72P31kj83FZFqxjHL8+KpdcEJl2I Qhbr//6UmLL1hRRo9M6/ooF77d72zoNDcP3HnaAuqO6vNS+hFB+1aPBSE6JN4vdKp8iaPr cDSZVu5fr2g0BaQ/wZ1PmxUwprzSQh0i7ldduLIGQ2rDolaXXly29M11rIB5hJo/0pvOhR ny6QQdAeefXohmKGK5ywwwEFEe87GgRBIydojzRV2I7dytXOlhzcAFZ0qKMVvyUJwyCs5M rde6mtu7HKfPUqQhF/lrRLlg6IS7S0KORt02ilwmVPJV8KSu1/B7fTz6MHxDeQ== 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 4RwhD44QmFzlNR; Wed, 27 Sep 2023 16:00:52 +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 38RG0qsH036506; Wed, 27 Sep 2023 16:00:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38RG0qVD036503; Wed, 27 Sep 2023 16:00:52 GMT (envelope-from git) Date: Wed, 27 Sep 2023 16:00:52 GMT Message-Id: <202309271600.38RG0qVD036503@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: 87534f95dd2e - main - makefs/zfs tests: Run zdb prior to importing makefs-created pools 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 87534f95dd2ed51e01165e0072cb1c7790809a8b Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=87534f95dd2ed51e01165e0072cb1c7790809a8b commit 87534f95dd2ed51e01165e0072cb1c7790809a8b Author: Mark Johnston AuthorDate: 2023-09-27 15:58:34 +0000 Commit: Mark Johnston CommitDate: 2023-09-27 16:00:00 +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 --- 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 }