[17.09] Overlay fix for transient IP reuse #2016
Merged
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
thaJeztah
changed the title
thaJeztah
changed the title
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>
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>
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>
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com> (cherry picked from commit 097b363) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com> (cherry picked from commit b12d63c) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
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 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>
thaJeztah
force-pushed
the
17.09-backport-overlay-setmatrix
branch
from
06317a2 to
de2bf60
Compare
|
LGTM |
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 #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