c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-03-10 20:36:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

ZTS: Fix zed_synchronous_zedlet

Browse Source 
Wait for scrub_finish (as the comments in the code suggest) rather
than trim_finish in zed_synchronous_zedlet.ksh.  This seems to
workaround the ZTS failures in #18192.  Also, fix some typos.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tony Hutter <hutter2@llnl.gov>
Closes #18192
Closes #18196
This commit is contained in:
Tony Hutter 2026-02-11 10:05:14 -08:00 committed by GitHub
parent fdd70565cb
commit 3463d40779
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/zfs-tests/tests/functional/events/zed_synchronous_zedlet.ksh
View File

@ -111,14 +111,14 @@ log_must zed_start
# Do a scrub - it should be instantaneous.
log_must zpool scrub -w $TESTPOOL2
# Start off a trim immediately after scrubiung. The trim should be
# instantaneous and generate a trimp_start event. This will happen in parallel
# Start off a trim immediately after scrubbing. The trim should be
# instantaneous and generate a trim_start event. This will happen in parallel
# with the slow 'scrub_finish-sync-slow.sh' zedlet still running.
log_must zpool trim -w $TESTPOOL2
# Wait for scrub_finish event to happen for sanity. This is the *event*, not
# the completion of zedlets for the event.
log_must file_wait_event $ZED_DEBUG_LOG 'sysevent\.fs\.zfs\.trim_finish' 10
log_must file_wait_event $ZED_DEBUG_LOG 'sysevent\.fs\.zfs\.scrub_finish' 10
# At a minimum, scrub_start-slow.sh + scrub_finish-sync-slow.sh will take a
# total of 6 seconds to run, so wait 7 sec to be sure.