Skip to content

ZTS: Fix zed_synchronous_zedlet - #18196

Merged
behlendorf merged 1 commit into
openzfs:masterfrom
tonyhutter:zed-sync-fix
Feb 11, 2026
Merged

behlendorf merged 1 commit into
openzfs:masterfrom
tonyhutter:zed-sync-fix

Conversation

@tonyhutter

Copy link
Copy Markdown
Contributor

Motivation and Context

Fix ZTS failure: #18192

Description

Wait for scrub_finish event (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.

How Has This Been Tested?

Ran test across all runners 7 times in CI with no zed_synchronous_zedlet failures.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Performance enhancement (non-breaking change which improves efficiency)
  • Code cleanup (non-breaking change which makes code smaller or more readable)
  • Quality assurance (non-breaking change which makes the code more robust against bugs)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Library ABI change (libzfs, libzfs_core, libnvpair, libuutil and libzfsbootenv)
  • Documentation (a change to man pages or other documentation)

Checklist:

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 openzfs#18192.  Also, fix some typos.

Fixes: openzfs#18192
Signed-off-by: Tony Hutter <hutter2@llnl.gov>
@behlendorf behlendorf added the Status: Accepted Ready to integrate (reviewed, tested) label Feb 11, 2026
@behlendorf
behlendorf merged commit 3463d40 into openzfs:master Feb 11, 2026
40 of 42 checks passed
tonyhutter added a commit to tonyhutter/zfs that referenced this pull request Feb 11, 2026
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 openzfs#18192.  Also, fix some typos.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tony Hutter <hutter2@llnl.gov>
Closes openzfs#18192
Closes openzfs#18196
lundman pushed a commit to openzfsonosx/openzfs-fork that referenced this pull request Jul 30, 2026
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 openzfs#18192.  Also, fix some typos.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tony Hutter <hutter2@llnl.gov>
Closes openzfs#18192
Closes openzfs#18196
pull Bot pushed a commit to A-Archives-and-Forks/openzfs that referenced this pull request Sep 26, 2026
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 openzfs#18192.  Also, fix some typos.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tony Hutter <hutter2@llnl.gov>
Closes openzfs#18192
Closes openzfs#18196
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Status: Accepted Ready to integrate (reviewed, tested)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants