[backport 17.06]Adding logic to restore networks in order#2584
Merged
Conversation
This commits adds a fix for restore case where there might a mix of allocated and unallocated network in raft. During restore the allocator was going over the networks lexicographically which would mean that there might be a chance for an unallocated network say net1 o be allocated the same vxlan id or subnet pool that was allocated to another networki net2. Because of this during restoring, when allocator tries to allocate the reallocate network net2, it would fail because it allocated network resources to net1 during restore. This would mean services,tasks and network itself would be in a messed up state. Signed-off-by: Abhinandan <abhi@docker.com>
abhi
changed the title
anshulpundir
approved these changes
Apr 2, 2018
nishanttotla
approved these changes
Apr 2, 2018
Codecov Report
@@ Coverage Diff @@
## bump_v17.06 #2584 +/- ##
===============================================
+ Coverage 60.99% 61.12% +0.13%
===============================================
Files 120 120
Lines 20011 20025 +14
===============================================
+ Hits 12205 12240 +35
+ Misses 6462 6441 -21
Partials 1344 1344 |
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
3 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.
This commits adds a fix for restore case where there might a mix of allocated and unallocated
network in raft. During restore the allocator was going over the networks lexicographically which would mean that there might be a chance for an unallocated network say net1 o be allocated the same vxlan
id or subnet pool that was allocated to another networki net2. Because of this during restoring, when allocator tries to allocate the reallocate network net2, it would fail because it allocated network resources to net1 during restore. This would mean services,tasks and network itself would be in a
messed up state.
(cherry picked from commit 7f9db67)
Signed-off-by: Abhinandan abhi@docker.com