From 6e01b47a2856009a2ced19733d2651f89e8ef8ee Mon Sep 17 00:00:00 2001 From: Rich Ercolani <214141+rincebrain@users.noreply.github.com> Date: Tue, 1 Jun 2021 17:34:19 -0400 Subject: [PATCH] Quick fixes for two ZTS failures On FreeBSD 14, these two tests started erroring out like the objects they're attempting to examine don't exist. Reviewed-by: Brian Behlendorf Reviewed-by: John Kennedy Reviewed-by: Ryan Moeller Signed-off-by: Rich Ercolani Closes #12165 --- tests/zfs-tests/tests/functional/cli_root/zdb/zdb_checksum.ksh | 1 + tests/zfs-tests/tests/functional/cli_root/zdb/zdb_objset_id.ksh | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/zfs-tests/tests/functional/cli_root/zdb/zdb_checksum.ksh b/tests/zfs-tests/tests/functional/cli_root/zdb/zdb_checksum.ksh index eeff6575f0..4f661262a7 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zdb/zdb_checksum.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zdb/zdb_checksum.ksh @@ -50,6 +50,7 @@ listing=$(ls -i $init_data) set -A array $listing obj=${array[0]} log_note "file $init_data has object number $obj" +sync_pool $TESTPOOL output=$(zdb -ddddddbbbbbb $TESTPOOL/$TESTFS $obj 2> /dev/null \ |grep -m 1 "L0 DVA" |head -n1) diff --git a/tests/zfs-tests/tests/functional/cli_root/zdb/zdb_objset_id.ksh b/tests/zfs-tests/tests/functional/cli_root/zdb/zdb_objset_id.ksh index f0c1076c97..d23cc43c90 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zdb/zdb_objset_id.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zdb/zdb_objset_id.ksh @@ -57,6 +57,7 @@ listing=$(ls -i $init_data) set -A array $listing obj=${array[0]} log_note "file $init_data has object number $obj" +sync_pool $TESTPOOL output=$(zdb -d $TESTPOOL/$TESTFS) objset_id=$(echo $output | awk '{split($0,array,",")} END{print array[2]}' |