block: Retry locking when interrupted by EINTR - #8402
Merged
rbradford merged 1 commit intoJun 17, 2026
Merged
Conversation
Acquiring an image lock can be interrupted with EINTR. In this case, we returned with an error. Instead, we now retry acquiring the lock. Signed-off-by: Pascal Scholz <[email protected]> On-behalf-of: SAP [email protected]
phip1611
approved these changes
Jun 17, 2026
phip1611
left a comment
Member
There was a problem hiding this comment.
Thanks! This clearly should fix an unlikely but possible bug.
| // See man page for error code: | ||
| // <https://man7.org/linux/man-pages/man2/fcntl.2.html> | ||
| libc::EAGAIN | libc::EACCES => return Err(LockError::AlreadyLocked), | ||
| libc::EINTR => continue, |
Member
There was a problem hiding this comment.
This well matches th pattern we have also elsewhere in CH (typically with std::io::ErrorKind::Interrupted but that is because we are using higher-level libs there).
LGTM!
scholzp
marked this pull request as ready for review
June 17, 2026 08:07
rbradford
approved these changes
Jun 17, 2026
Member
|
Thanks! |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
We observed that setting image advisory locks can fail if we receive an EINTR while doing so.
We retry acquiring the lock in case of EINT to recover from it instead of aborting with an error.