[release/v0.9] Handle cleanup DNS for attachable container - #1999
Merged
Merged
Conversation
Contributor
Author
andrewhsu
changed the title
mavenugo
reviewed
Oct 23, 2017
| } | ||
| } | ||
|
|
||
| func (c *controller) getLBIndex(sid, nid string, ingressPorts []*PortConfig) int { |
Contributor
There was a problem hiding this comment.
This function is not used by this commit. I dont think adding this new function to resolve the conflict is appropriate.
Contributor
Author
There was a problem hiding this comment.
i've updated the commit a75ba12 to not include getLBIndex in service_common.go
mavenugo
suggested changes
Oct 23, 2017
mavenugo
left a comment
mavenugo
left a comment
Contributor
There was a problem hiding this comment.
The conflict resolution needs some care.
added 2 commits
October 23, 2017 17:03
Attachable containers they are tasks with no service associated their cleanup was not done properly so it was possible to have a leak of their name resolution if that was the last container on the network. Cleanupservicebindings was not able to do the cleanup because there is no service, while also the notification of the delete arrives after that the network is already being cleaned Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com> (cherry picked from commit 1c04e19) Conflicts: service_common.go Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
|
looks good now, thanks |
|
I believe we have e2e tests for this as well that can now be run automated using testkit. @antonybichon17 |
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
4 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:
with cherry-pick of git commits 1c04e19 52a9ab5:
conflict with file
service_common.goresolved by adding functions:func (c *controller) getLBIndex(sid, nid string, ingressPorts []*PortConfig) intfunc (c *controller) cleanupServiceDiscovery(cleanupNID string)