[18.09 backport] Correctly clean up --config-only networks #2391
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
euanh
approved these changes
Jun 7, 2019
|
Looks like I need to cherry-pick something else to make CI work again; |
|
@thaJeztah: try this |
|
opened #2392 with the backport for that fix; I'll rebase this one after that's merged |
The endpoint count for --config-only networks was being incremented even when the respective --config-from inherited network failed to create a network This was due to a variable shadowing problem with err causing the deferred function to not execute correctly. Using the same err variable across the entire function fixes the issue Fixes: moby/moby#35101 Signed-off-by: Arko Dasgupta <arko.dasgupta@docker.com> (cherry picked from commit eacb56d) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
force-pushed
the
18.09_backport_ungraceful_exit_config_from_net_clean
branch
from
6e8a883
to
b2e61e9
Compare
thaJeztah
deleted the
18.09_backport_ungraceful_exit_config_from_net_clean
branch
thaJeztah
added a commit
to thaJeztah/docker
that referenced
this pull request
Jul 23, 2019
full diff: moby/libnetwork@e7933d4...55685ba changes included: - moby/libnetwork#2382 Backporting PR 2069 to bump_18.09 - backport of https://github.com/docker/libnetwork#2069 Rolling back the port configs if failed to programIngress() - moby/libnetwork#2363 [18.09] align dependencies with engine 18.09 - moby/libnetwork#2400 [18.09 backport] Fix TestValidRemoteDriver GetCapabilities errors - moby/libnetwork#2391 [18.09 backport] Correctly clean up --config-only networks - backport of moby/libnetwork#2373 - fixes moby#35101 - moby/libnetwork#2392 [18.09 backport] remove gosimple - package is gone and it's not important Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
docker-jenkins
pushed a commit
to docker-archive/docker-ce
that referenced
this pull request
Jul 25, 2019
full diff: moby/libnetwork@e7933d4...55685ba changes included: - moby/libnetwork#2382 Backporting PR 2069 to bump_18.09 - backport of https://github.com/docker/libnetwork#2069 Rolling back the port configs if failed to programIngress() - moby/libnetwork#2363 [18.09] align dependencies with engine 18.09 - moby/libnetwork#2400 [18.09 backport] Fix TestValidRemoteDriver GetCapabilities errors - moby/libnetwork#2391 [18.09 backport] Correctly clean up --config-only networks - backport of moby/libnetwork#2373 - fixes moby/moby#35101 - moby/libnetwork#2392 [18.09 backport] remove gosimple - package is gone and it's not important Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 0a3767c7e9803f0a595a07b0548e99d60e861062 Component: engine
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.
backport of #2373 for 18.09
The endpoint count for --config-only networks
was being incremented even when the respective --config-from
inherited network failed to create a network
This was due to a variable shadowing problem with err causing
the deferred function to not execute correctly.
Using the same err variable across the entire function fixes
the issue
Fixes: moby/moby#35101