Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[17.09] Overlay fix for transient IP reuse #2016

Merged
merged 7 commits into from Nov 20, 2017
Merged

[17.09] Overlay fix for transient IP reuse #2016

merged 7 commits into from Nov 20, 2017

Commits on Nov 20, 2017

  1. 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>
    @aaronlehmann @thaJeztah
    aaronlehmann authored and thaJeztah committed Nov 20, 2017
    Configuration menu
    Copy the full SHA
    67ea5ce View commit details
    Browse the repository at this point in the history

  2. 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>
    @thaJeztah
    Flavio Crisciani authored and thaJeztah committed Nov 20, 2017
    Configuration menu
    Copy the full SHA
    4601852 View commit details
    Browse the repository at this point in the history

  3. 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>
    @thaJeztah
    Flavio Crisciani authored and thaJeztah committed Nov 20, 2017
    Configuration menu
    Copy the full SHA
    cdd8d7d View commit details
    Browse the repository at this point in the history

  4. 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>
    @thaJeztah
    Flavio Crisciani authored and thaJeztah committed Nov 20, 2017
    Configuration menu
    Copy the full SHA
    b0c3fe6 View commit details
    Browse the repository at this point in the history

  5. 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>
    @thaJeztah
    Flavio Crisciani authored and thaJeztah committed Nov 20, 2017
    Configuration menu
    Copy the full SHA
    52b263e View commit details
    Browse the repository at this point in the history

  6. 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>
    @thaJeztah
    Flavio Crisciani authored and thaJeztah committed Nov 20, 2017
    Configuration menu
    Copy the full SHA
    79f0e46 View commit details
    Browse the repository at this point in the history

  7. 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>
    @thaJeztah
    Flavio Crisciani authored and thaJeztah committed Nov 20, 2017
    Configuration menu
    Copy the full SHA
    de2bf60 View commit details
    Browse the repository at this point in the history