Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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 <behlendorf1@llnl.gov>
Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Signed-off-by: Rich Ercolani <rincebrain@gmail.com>
Closes #12165
This commit is contained in:
Rich Ercolani 2021-06-01 17:34:19 -04:00 committed by GitHub
parent 8bd41ebd54
commit 6c7c7201d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/zfs-tests/tests/functional/cli_root/zdb/zdb_checksum.ksh
View File

@ -50,6 +50,7 @@ listing=$(ls -i $init_data)
set -A array $listing set -A array $listing
obj=${array[0]} obj=${array[0]}
log_note "file $init_data has object number $obj" log_note "file $init_data has object number $obj"
sync_pool $TESTPOOL
output=$(zdb -ddddddbbbbbb $TESTPOOL/$TESTFS $obj 2> /dev/null \ output=$(zdb -ddddddbbbbbb $TESTPOOL/$TESTFS $obj 2> /dev/null \
|grep -m 1 "L0 DVA" |head -n1) |grep -m 1 "L0 DVA" |head -n1)

1
tests/zfs-tests/tests/functional/cli_root/zdb/zdb_objset_id.ksh
View File

@ -57,6 +57,7 @@ listing=$(ls -i $init_data)
set -A array $listing set -A array $listing
obj=${array[0]} obj=${array[0]}
log_note "file $init_data has object number $obj" log_note "file $init_data has object number $obj"
sync_pool $TESTPOOL
output=$(zdb -d $TESTPOOL/$TESTFS) output=$(zdb -d $TESTPOOL/$TESTFS)
objset_id=$(echo $output | awk '{split($0,array,",")} END{print array[2]}' | objset_id=$(echo $output | awk '{split($0,array,",")} END{print array[2]}' |