Reduce timeout to zero when running inside a container #17922
Merged
+37
−0
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
behlendorf
reviewed
Nov 10, 2025
Adi-Goll
force-pushed
the
container-timeout-fix
branch
2 times, most recently
from
52b7a1f to
57f3a75
Compare
Detect container environments and set timeout to zero unless ZFS_MODULE_TIMEOUT is already set. This avoids an unnecessary ten second delay after running zfs/zpool commands in a container where /dev/zfs is unavailable. Signed-off-by: Adi Gollamudi <[email protected]> Closes issue openzfs#15165
Adi-Goll
force-pushed
the
container-timeout-fix
branch
from
57f3a75 to
01b4db2
Compare
behlendorf
approved these changes
Nov 11, 2025
Contributor
behlendorf
left a comment
behlendorf
left a comment
There was a problem hiding this comment.
Thanks for refreshing this.
behlendorf
added
Status: Accepted
behlendorf
pushed a commit
to behlendorf/zfs
that referenced
this pull request
Nov 12, 2025
Detect container environments and set timeout to zero unless ZFS_MODULE_TIMEOUT is already set. This avoids an unnecessary ten second delay after running zfs/zpool commands in a container where /dev/zfs is unavailable. Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Adi Gollamudi <[email protected]> Closes openzfs#15165 Closes openzfs#17922
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Detect container environments and set timeout to zero unless ZFS_MODULE_TIMEOUT is already set. This avoids an unnecessary ten second delay after running zfs/zpool commands in a container where /dev/zfs is unavailable.
Closes issue #15165
Motivation and Context
This change reuses the code from a downstream patch to zfs-linux
Description
After review: added a function with more comprehensive checks for systemd, Docker, containerd, Kubernetes, and LXC
How Has This Been Tested?
Types of changes
Checklist:
Signed-off-by.