c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-03-14 06:16:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

ZTS: make get_same_blocks() fail harder if zdb fails

Browse Source 
Because it's called in $(...), it will swallow all errors, so we have to
work harder to recognise falure and echo a string that can't ever match
what the test is expecting.

Sponsored-by: TrueNAS
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Alexander Motin <alexander.motin@TrueNAS.com>
Signed-off-by: Rob Norris <rob.norris@truenas.com>
Closes #18230
This commit is contained in:
Rob Norris 2026-02-17 19:41:14 +11:00 committed by Brian Behlendorf
parent aeb9fb3828
commit b021cb60aa
1 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
tests/zfs-tests/include/libtest.shlib
View File

@ -30,6 +30,7 @@
# Copyright (c) 2017, Open-E Inc. All rights reserved. # Copyright (c) 2017, Open-E Inc. All rights reserved.
# Copyright (c) 2021, The FreeBSD Foundation. # Copyright (c) 2021, The FreeBSD Foundation.
# Copyright (c) 2025, Klara, Inc. # Copyright (c) 2025, Klara, Inc.
# Copyright (c) 2026, TrueNAS.
# Use is subject to license terms. # Use is subject to license terms.
# #
@ -3951,18 +3952,45 @@ function pop_coredump_pattern
# #
function get_same_blocks # dataset1 file1 dataset2 file2 [key] function get_same_blocks # dataset1 file1 dataset2 file2 [key]
{ {
typeset KEY=$5 typeset ds1=$1
if [ ${#KEY} -gt 0 ]; then typeset file1=$2
KEY="--key=$KEY" typeset ds2=$3
typeset file2=$4
typeset key=$5
typeset keyarg=
if [ ${#key} -gt 0 ]; then
keyarg="--key=$key"
fi fi
# this is usually called as $(get_same_blocks ...), and so expected
# to put its result on stdout, and usually the caller is not watching
# for failure. this makes things a little tricky to fail properly if
# zdb fails or crashes, as we end up returning an empty string, which
# is a valid return (no blocks the same)
#
# to get around this, we check zdb's return and echo a dummy value
# before returning failure. this will not match whatever the caller
# is checking for. if they do call it with log_must, then they get
# a failure as expected.
typeset zdbout1=$(mktemp) typeset zdbout1=$(mktemp)
typeset zdbout2=$(mktemp) typeset zdbout2=$(mktemp)
zdb $KEY -vvvvv $1 -O $2 | \ typeset awkout1=$(mktemp)
awk '/ L0 / { print l++ " " $3 " " $7 }' > $zdbout1 typeset awkout2=$(mktemp)
zdb $KEY -vvvvv $3 -O $4 | \
awk '/ L0 / { print l++ " " $3 " " $7 }' > $zdbout2 zdb $keyarg -vvvvv $ds1 -O $file1 > $zdbout1
echo $(sort -n $zdbout1 $zdbout2 | uniq -d | cut -f1 -d' ') [[ $? -ne 0 ]] && echo "zdb $ds1 failed" && return 1
rm -f $zdbout1 $zdbout2
zdb $keyarg -vvvvv $ds2 -O $file2 > $zdbout2
[[ $? -ne 0 ]] && echo "zdb $ds2 failed" && return 1
awk '/ L0 / { print l++ " " $3 " " $7 }' < $zdbout1 > $awkout1
awk '/ L0 / { print l++ " " $3 " " $7 }' < $zdbout2 > $awkout2
echo $(sort -n $awkout1 $awkout2 | uniq -d | cut -f1 -d' ')
rm -f $zdbout1 $zdbout2 $awkout1 $awkout2
} }
. ${STF_SUITE}/include/kstat.shlib . ${STF_SUITE}/include/kstat.shlib