pkg/lockfile: nits #1336
Merged
pkg/lockfile: nits #1336
Conversation
This file contains 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
Since commit 162a0bf, openLock creates a file even if ro is set, but the documentation says otherwise. Since commit 16de6d3, openLock also creates file's parent directories if needed, but the documentation doesn't say that. Fix both issues. Signed-off-by: Kir Kolyshkin <[email protected]>
Since commit 162a0bf, openLock creates a file in case ro argument is set, but the file is created with 0 permission bits. Fix this, and unify the file creation logic while at it. Signed-off-by: Kir Kolyshkin <[email protected]>
unix.Open returns a bare error (like EPERM). This is worked around in on user, (*lockfile).lock, where we panic, but not in the other user, createLockerForPath, and as a result such a bare error might be returned from GetLockfile or GetROLockfile. Wrap it into os.PathError and remove the workaround from lockfile.lock. Signed-off-by: Kir Kolyshkin <[email protected]>
kolyshkin
commented
Sep 12, 2022
| ) | ||
| flags := os.O_RDONLY | unix.O_CLOEXEC | os.O_CREATE | ||
| if !ro { | ||
| flags |= os.O_RDWR |
There was a problem hiding this comment.
This relies on the fact that O_RDONLY value is 0.
There was a problem hiding this comment.
That’s
- Extremely non-obvious to careless users.
- Not guaranteed to be true, and in fact not true on at least one Go-supported platform right now (though, to be fair, not a platform currently supported by Podman).
Please just do the obviously-correct thing.
There was a problem hiding this comment.
More generally, the assumption is O_RDONLY does not have any bits set that O_RDWR doesn't.
That is true even for zOS (the only Golang platform where O_RDONLY != 0). In zOS, O_RDONLY is 2 and O_RDWR is 3.
Having said that, your code is definitely better as it does not have any such undocumented assumptions.
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.
Fix one issue and a couple of nits in pkg/lockfile. Please see individual commits for details.