Improve error detection when loading config#5027
Merged
mxpv merged 1 commit intocontainerd:masterfrom Feb 10, 2021
Merged
Conversation
Previously we simply ignored any not found error when loading the containerd config. This created unintuitive behavior: - If the user specified a path that didn't exist via --config, we would silently ignore the error. - If a config specified an import that didn't exist, we would silently ignore the error. In either of these cases, it appears we would end up using a potentially corrupted config, as it would contain any files that were merged into it before the not found error was hit. However, we can't just remove the check for !os.IsNotExist(err), as we shouldn't throw an error when --config is not passed, but the default config doesn't exist. This change updates the logic to only attempt to load the config if we know it exists, or the user passed --config. Signed-off-by: Kevin Parsons <[email protected]>
|
Build succeeded.
|
thaJeztah
approved these changes
Feb 10, 2021
Member
thaJeztah
left a comment
thaJeztah
left a comment
There was a problem hiding this comment.
LGTM
reminds me I still have to do the same for docker/cli#1637 😅
kzys
approved these changes
Feb 10, 2021
mxpv
approved these changes
Feb 10, 2021
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
4 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.
Previously we simply ignored any not found error when loading the
containerd config. This created unintuitive behavior:
silently ignore the error.
ignore the error.
In either of these cases, it appears we would end up using a potentially
corrupted config, as it would contain any files that were merged into it
before the not found error was hit.
However, we can't just remove the check for !os.IsNotExist(err),
as we shouldn't throw an error when --config is not passed, but the
default config doesn't exist.
This change updates the logic to only attempt to load the config if
we know it exists, or the user passed --config.
Signed-off-by: Kevin Parsons [email protected]
Note: This is a change in behavior for config loading, but as far as I can tell the previous behavior could be dangerous and end up with an incomplete config. So I think it's worth fixing this, but looking for feedback. :)