Skip to content

Commit ed54b55

Browse files
committed
BRT: Check pool stats in more tests
This should allow to catch some leaks, if those happen. Signed-off-by: Alexander Motin <[email protected]> Sponsored by: iXsystems, Inc.
1 parent 3f4277a commit ed54b55

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

tests/zfs-tests/tests/functional/bclone/bclone_corner_cases.kshlib

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ function bclone_corner_cases_init
6666
export SECOND_HALF_ORIG0_CHECKSUM=$(second_half_checksum $ORIG0)
6767
export SECOND_HALF_ORIG1_CHECKSUM=$(second_half_checksum $ORIG1)
6868
export SECOND_HALF_ORIG2_CHECKSUM=$(second_half_checksum $ORIG2)
69-
export ZEROS_CHECKSUM=$(dd if=/dev/zero bs=$HALFRECORDSIZE count=1 | sha256digest)
69+
export ZEROS_CHECKSUM=$(dd if=/dev/zero bs=$HALFRECORDSIZE count=1 2>/dev/null | sha256digest)
7070
export FIRST_HALF_CHECKSUM=""
7171
export SECOND_HALF_CHECKSUM=""
7272
}
@@ -77,7 +77,7 @@ function cache_clone
7777

7878
case "$cached" in
7979
"cached")
80-
dd if=$CLONE of=/dev/null bs=$RECORDSIZE 2>/dev/null
80+
log_must dd if=$CLONE of=/dev/null bs=$RECORDSIZE
8181
;;
8282
"uncached")
8383
;;
@@ -210,13 +210,20 @@ function bclone_corner_cases_test
210210
typeset -r dstdir=$2
211211
typeset limit=$3
212212
typeset -i count=0
213+
typeset oused
214+
typeset osaved
213215

214216
if [[ $srcdir != "count" ]]; then
215217
if [[ -n "$limit" ]]; then
216218
typeset -r total_count=$(bclone_corner_cases_test count)
217219
limit=$(random_int_between 1 $total_count $((limit*2)) | sort -nu | head -n $limit | xargs)
218220
fi
219221
bclone_corner_cases_init $srcdir $dstdir
222+
223+
# Save current block cloning stats for later use.
224+
sync_pool $TESTPOOL
225+
oused=$(get_pool_prop bcloneused $TESTPOOL)
226+
osaved=$(get_pool_prop bclonesaved $TESTPOOL)
220227
fi
221228

222229
#
@@ -300,6 +307,9 @@ function bclone_corner_cases_test
300307
fi
301308

302309
rm -f "$CLONE"
310+
sync_pool $TESTPOOL
311+
verify_pool_prop_eq bcloneused $oused
312+
verify_pool_prop_eq bclonesaved $osaved
303313
done
304314
done
305315
done

0 commit comments

Comments
 (0)