allocateNetwork: fix network sandbox not cleaned up on failure#41020
Merged
tiborvass merged 2 commits intomoby:masterfrom Jun 5, 2020
Merged
allocateNetwork: fix network sandbox not cleaned up on failure#41020tiborvass merged 2 commits intomoby:masterfrom
tiborvass merged 2 commits intomoby:masterfrom
Conversation
The defer function was checking for the local `err` variable, not on the error that was returned by the function. As a result, the sandbox would never be cleaned up for containers that used "none" networking, and a failiure occured during setup. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
allocateNetwork() can return early, in which case these variables were unused. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Member
Author
xinfengliu
reviewed
May 25, 2020
| @@ -594,7 +596,7 @@ func (daemon *Daemon) allocateNetwork(container *container.Container) error { | |||
| } | |||
| updateSandboxNetworkSettings(container, sb) | |||
| defer func() { | |||
Contributor
There was a problem hiding this comment.
The purpose of defer here is to handle the err in following container.WriteHostConfig(). You are right @thaJeztah .
Member
Author
There was a problem hiding this comment.
Yes, it's very easy to overlook the problem. My eye just fell on it, and I thought: "that doesn't look right!"
xinfengliu
approved these changes
May 29, 2020
tiborvass
approved these changes
May 31, 2020
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.
The defer function was checking for the local
errvariable, not on the error that was returned by the function. As a result, the sandbox would never be cleaned up for containers that used "none" networking, and a failiure occured during setup.The second commit is a small refactor; allocateNetwork() can return early, in which case these variables were unused, so assign them later in the function.
Looks like this was introduced in #31996 (which was created to address #31597)
- Description for the changelog