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.

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

Backport sd race network #1812

Merged
merged 7 commits into from
Jun 18, 2017

Conversation

fcrisciani
Copy link

Backport of #1808

Flavio Crisciani 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 fcrisciani force-pushed the backport-sd-race-network branch 3 times, most recently from 62ecd27 to 57bef58 Compare June 16, 2017 20:53
Flavio Crisciani 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 fcrisciani force-pushed the backport-sd-race-network branch from 0299efe to 05bd0fb Compare June 18, 2017 05:31
Copy link
Contributor

@mavenugo mavenugo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@mavenugo mavenugo merged commit 5b96bb7 into moby:release/v0.9 Jun 18, 2017
@fcrisciani fcrisciani deleted the backport-sd-race-network branch June 18, 2017 17:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants