zpl: handle suspend from two remaining calls to txg_wait_synced()
#17413
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 tasks
amotin
approved these changes
Jun 2, 2025
behlendorf
approved these changes
Jun 2, 2025
4653e2f (openzfs#17355) allows dmu_tx_assign() to fail if the pool suspends when failmode=continue, but zfs_link() can fall back to txg_wait_synced() if it has to wait for a tempfile to be fully created before continuing, which will block if the pool suspends. Handle this by requesting an error return if the pool suspends when failmode=continue, and if that happens, return EIO. Sponsored-by: Klara, Inc. Sponsored-by: Wasabi Technology, Inc. Signed-off-by: Rob Norris <rob.norris@klarasystems.com>
4653e2f (openzfs#17355) allows dmu_tx_assign() to fail if the pool suspends when failmode=continue, but zfs_clone_range() can fall back to txg_wait_synced() if it has to wait for a dirty block to be written out, which will block if the pool suspends. Handle this by requesting an error return if the pool suspends when failmode=continue, and if that happens, return EIO. Sponsored-by: Klara, Inc. Sponsored-by: Wasabi Technology, Inc. Signed-off-by: Rob Norris <rob.norris@klarasystems.com>
robn
force-pushed
the
zpl-txg-suspend-break
branch
from
da29c78 to
a13f25e
Compare
amotin
approved these changes
Jun 5, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation and Context
Following #17355, there's two remaining ZPL ops that use
txg_wait_synced()directly. This converts them to allow suspend.(This came from review on #17398, but not really related).
Description
Convert the two call sites to
txg_wait_synced_flags(), settingTXG_WAIT_SUSPENDwhenfailmode=continue, and handling a suspend (ESHUTDOWN) by returningEIO.(Aside: this particular pattern of checking
spa_failmode, choosing the right suspend flags and making the call could probably be a macro, but I couldn't think of a great name right now, and I can live with it for two calls. It's probably ok to wait for the moment, at least until a similar question in #17398 is resolved, and until an update to #11082 is posted, as I know @ihoro has some "convert the errors" ideas in there).How Has This Been Tested?
Compile checked on Linux and FreeBSD. Will rely on CI tests to make sure I haven't broken anything. Nothing tests these codepaths directly though.
Types of changes
Checklist:
Signed-off-by.