Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cherrypick 2 snapshot fixes for 2.1.13 #15187

Merged
merged 2 commits into from
Aug 25, 2023
Merged

Cherrypick 2 snapshot fixes for 2.1.13 #15187

merged 2 commits into from
Aug 25, 2023

Commits on Aug 18, 2023

  1. Workaround issue cleaning up automounted snapshots on Linux 

    On Linux, sometimes, when ZFS goes to unmount an automounted snap,
it fails a VERIFY check on debug builds, because taskq_cancel_id
returned ENOENT after not finding the taskq it was trying to cancel.

This presumably happens when it already died for some reason; in this
case, we don't really mind it already being dead, since we're just
going to dispatch a new task to unmount it right after.

So we just ignore it if we get back ENOENT trying to cancel here,
retry a couple times if we get back the only other possible condition
(EBUSY), and log to dbgmsg if we got anything but ENOENT or success.

(We also add some locking around taskqid, to avoid one or two cases
of two instances of trying to cancel something at once.)

Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Tony Nguyen <[email protected]>
Signed-off-by: Rich Ercolani <[email protected]>
Closes openzfs#11632
Closes openzfs#12670
    @rincebrain
    rincebrain committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    9643f99 View commit details
    Browse the repository at this point in the history

  2. quick fix for lingering snapdir unmount problems 

    Unfortunately, even after e79b680, I still, much more rarely,
tripped asserts when playing with many ctldir mounts at once.

Since this appears to happen if we dispatched twice too fast, just
ignore it. We don't actually need to do anything if someone already
started doing it for us.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Rich Ercolani <[email protected]>
Closes openzfs#14462
    @rincebrain
    rincebrain committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    f444734 View commit details
    Browse the repository at this point in the history