From 3463d40779fb0a053439967b4f8d7853f473d806 Mon Sep 17 00:00:00 2001 From: Tony Hutter Date: Wed, 11 Feb 2026 10:05:14 -0800 Subject: [PATCH] ZTS: Fix zed_synchronous_zedlet 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 Signed-off-by: Tony Hutter Closes #18192 Closes #18196 --- .../tests/functional/events/zed_synchronous_zedlet.ksh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/zfs-tests/tests/functional/events/zed_synchronous_zedlet.ksh b/tests/zfs-tests/tests/functional/events/zed_synchronous_zedlet.ksh index 6b732ea96..f88f191d6 100755 --- a/tests/zfs-tests/tests/functional/events/zed_synchronous_zedlet.ksh +++ b/tests/zfs-tests/tests/functional/events/zed_synchronous_zedlet.ksh @@ -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.