daemon: NewDaemon(): replace system.MkdirAll for os.Mkdir where possible #44317
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
`system.MkdirAll()` is a special version of os.Mkdir to handle creating directories
using Windows volume paths (`"\\?\Volume{4c1b02c1-d990-11dc-99ae-806e6f6e6963}"`).
This may be important when `MkdirAll` is used, which traverses all parent paths to
create them if missing (ultimately landing on the "volume" path).
The daemon.NewDaemon() function used `system.MkdirAll()` in various places where
a subdirectory within `daemon.Root` was created. This appeared to be mostly out
of convenience (to not have to handle `os.ErrExist` errors). The `daemon.Root`
directory should already be set up in these locations, and should be set up with
correct permissions. Using `system.MkdirAll()` would potentially mask errors if
the root directory is missing, and instead set up parent directories (possibly
with incorrect permissions).
Because of the above, this patch changes `system.MkdirAll` to `os.Mkdir`. As we
are changing these lines, this patch also changes the legacy octal notation
(`0700`) to the now preferred `0o700`.
One location continues to use `system.MkdirAll`, as the temp-directory may be
configured to be outside of `daemon.Root`, but a redundant `os.Stat(realTmp)`
was removed, as `system.MkdirAll` is expected to handle this.
As we are changing these lines, this patch also changes the legacy octal notation
(`0700`) to the now preferred `0o700`.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
commented
Oct 20, 2022
Comment on lines
+759
to
761
| if err := system.MkdirAll(realTmp, 0); err != nil { | ||
| return nil, fmt.Errorf("Unable to create the TempDir (%s): %s", realTmp, err) | ||
| } |
There was a problem hiding this comment.
I have a follow-up to this PR that makes this go away (but keeping steps "small" for now)
nit: you've got this text in the commit message twice |
samuelkarp
approved these changes
Oct 23, 2022
corhere
approved these changes
Oct 25, 2022
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.
system.MkdirAll()is a special version of os.Mkdir to handle creating directoriesusing Windows volume paths (
"\\?\Volume{4c1b02c1-d990-11dc-99ae-806e6f6e6963}").This may be important when
MkdirAllis used, which traverses all parent paths tocreate them if missing (ultimately landing on the "volume" path).
The daemon.NewDaemon() function used
system.MkdirAll()in various places wherea subdirectory within
daemon.Rootwas created. This appeared to be mostly outof convenience (to not have to handle
os.ErrExisterrors). Thedaemon.Rootdirectory should already be set up in these locations, and should be set up with
correct permissions. Using
system.MkdirAll()would potentially mask errors ifthe root directory is missing, and instead set up parent directories (possibly
with incorrect permissions).
Because of the above, this patch changes
system.MkdirAlltoos.Mkdir. As weare changing these lines, this patch also changes the legacy octal notation
(
0700) to the now preferred0o700.One location continues to use
system.MkdirAll, as the temp-directory may beconfigured to be outside of
daemon.Root, but a redundantos.Stat(realTmp)was removed, as
system.MkdirAllis expected to handle this.As we are changing these lines, this patch also changes the legacy octal notation
(
0700) to the now preferred0o700.