Backport sd race network #1812
Merged
Backport sd race network #1812
Conversation
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
added 2 commits
June 16, 2017 13:27
The SetMatrix is a generic data structure, so the description should not be tight to any specific use Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com> (cherry picked from commit 898e321)
- Added logic to handle name reuse from different services - Moved the deletion from the serviceBindings map at the end of the rmServiceBindings body to avoid race with new services Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com> (cherry picked from commit 5e657f6)
fcrisciani
force-pushed
the
backport-sd-race-network
branch
3 times, most recently
from
62ecd27 to
57bef58
Compare
added 5 commits
June 17, 2017 17:47
There was an extra parameter not in the formatters Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com> (cherry picked from commit b34bc70)
Use the locker to avoid the race between the network deletion and new endpoints being created Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com> (cherry picked from commit ee1326a)
Allow the cleanupServicebindings to take care of the service discovery cleanup. Also avoid to trigger the cleanup for each endpoint from an SD point of view LB and SD will be separated in the future Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com> (cherry picked from commit ccc21bc)
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com> (cherry picked from commit 5fd5257)
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com> (cherry picked from commit 49378070a1683d0b53550bc21e121816bdf28cd8)
fcrisciani
force-pushed
the
backport-sd-race-network
branch
from
0299efe to
05bd0fb
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Backport of #1808