New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[17.09] Overlay fix for transient IP reuse #2016

Merged
merged 7 commits into from Nov 20, 2017

Conversation

Projects
None yet
3 participants
@thaJeztah
Member

thaJeztah commented Nov 20, 2017

Backport of #1935 for 17.09.

To get a clean cherry-pick, I also included #1752, which brings no change in behaviour, so looked safe to include.

Also includes #1968 which depends on the other changes

# PR: https://github.com/docker/libnetwork/pull/1752
git checkout -b 17.09-backport-overlay-setmatrix upstream/bump_17.09
git cherry-pick -s -S -x dbd29259e6c2a4b9e17f87a87e5eee5c6eeb315d

# PR: https://github.com/docker/libnetwork/pull/1935
git cherry-pick -s -S -x 49200cbd8405988bdc55cfd62abc06ab16f33750
git cherry-pick -s -S -x 2ec096ace3e55967de909408a512f1fb01505577
git cherry-pick -s -S -x 097b363e6f9f1f65338aa26e8ef16a0c335d3550
git cherry-pick -s -S -x b12d63c76d9e43b521e37acc5b2209cd189edc18
git cherry-pick -s -S -x d93b9b086a7dba24e76d36b9f770d95cad9bc789

# PR: https://github.com/docker/libnetwork/pull/1968
git cherry-pick -s -S -x c32647ec928b2f87dacb76b6754283f613dcd24e

@thaJeztah thaJeztah changed the title from [17.09] Overlay fix for transient IP reuse to [17.09] Overlay fix for transient IP reuse + handle cleanup DNS for attachable container Nov 20, 2017

@thaJeztah thaJeztah changed the title from [17.09] Overlay fix for transient IP reuse + handle cleanup DNS for attachable container to [17.09] Overlay fix for transient IP reuse Nov 20, 2017

aaronlehmann and others added some commits May 9, 2017

all: Avoid trivial uses of Sprintf
Use the string concatenation operator instead of using Sprintf for
simple string concatenation. This is usually easier to read, and allows
the compiler to detect problems with the type or number of operands,
which would be runtime errors with Sprintf.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
(cherry picked from commit dbd2925)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Handle IP reuse in overlay
In case of IP reuse locally there was a race condition
that was leaving the overlay namespace with wrong configuration
causing connectivity issues.
This commit introduces the use of setMatrix to handle the transient
state and make sure that the proper configuration is maintained

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
(cherry picked from commit 49200cb)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
flush peerdb entries on network delete
peerDB was never being flushed on network delete
leaveing behind stale entries

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
(cherry picked from commit 2ec096a)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
log for miss notification
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
(cherry picked from commit 097b363)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Addressing code review comments
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
(cherry picked from commit b12d63c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Changed ipMask to string
Avoid error logs in case of local peer case, there is no need for deleteNeighbor
Avoid the network leave to readvertise already deleted entries to upper layer

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
(cherry picked from commit d93b9b0)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Fix IPMask marshalling
Fix marshalling and add test

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
(cherry picked from commit c32647e)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@fcrisciani

This comment has been minimized.

Show comment
Hide comment
@fcrisciani

fcrisciani Nov 20, 2017

Member

LGTM

Member

fcrisciani commented Nov 20, 2017

LGTM

@fcrisciani fcrisciani merged commit de5d871 into docker:bump_17.09 Nov 20, 2017

2 checks passed

ci/circleci Your tests passed on CircleCI!
Details
dco-signed All commits are signed

@thaJeztah thaJeztah deleted the thaJeztah:17.09-backport-overlay-setmatrix branch Nov 20, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment