Skip to content

Commit 2b5d806

Browse files
committed
Updating dio_read_verify ZTS test
There was a recent CI ZTS test failure on FreeBSD 14 for the dio_read_verify test case. The failure reported there was no ARC reads while the buffer wes being manipulated. All checksum verify errors for Direct I/O reads are rerouted through the ARC, so there should be ARC reads accounted for. In order to help debug any future failures of this test case, the order of checks has been changed. First there is a check for DIO verify failures for the reads and then ARC read counts are checked. This PR also contains general cleanup of the comments in the test script. Signed-off-by: Brian Atkinson <[email protected]>
1 parent f29dcc2 commit 2b5d806

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

tests/zfs-tests/tests/functional/direct/dio_read_verify.ksh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,17 @@ for type in "" "mirror" "raidz" "draid"; do
8282
log_must manipulate_user_buffer -f "$mntpnt/direct-write.iso" \
8383
-n $NUMBLOCKS -b $BS -r
8484

85-
# Getting new Direct I/O and ARC Write counts.
85+
# Getting new Direct I/O and ARC read counts.
8686
curr_dio_rd=$(get_iostats_stat $TESTPOOL1 direct_read_count)
8787
curr_arc_rd=$(get_iostats_stat $TESTPOOL1 arc_read_count)
8888
total_dio_rd=$((curr_dio_rd - prev_dio_rd))
8989
total_arc_rd=$((curr_arc_rd - prev_arc_rd))
9090

9191
log_note "Making sure there are no checksum errors with the ZPool"
9292
log_must check_pool_status $TESTPOOL "errors" "No known data errors"
93+
94+
log_note "Making sure we have Direct I/O read checksum verifies with ZPool"
95+
check_dio_chksum_verify_failures "$TESTPOOL1" "$vdev_type" 1 "rd"
9396

9497
log_note "Making sure we have Direct I/O and ARC reads logged"
9598
if [[ $total_dio_rd -lt 1 ]]; then
@@ -99,8 +102,6 @@ for type in "" "mirror" "raidz" "draid"; do
99102
log_fail "No ARC reads $total_arc_rd"
100103
fi
101104

102-
log_note "Making sure we have Direct I/O write checksum verifies with ZPool"
103-
check_dio_chksum_verify_failures "$TESTPOOL1" "$vdev_type" 1 "rd"
104105
destroy_pool $TESTPOOL1
105106
done
106107

0 commit comments

Comments
 (0)