Include host scope for container joins based on IP. #577
Conversation
This file contains 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
tomwilkie
force-pushed
the
520-edge-bug
branch
3 times, most recently
from
2f90fbc to
f0fb6e3
Compare
tomwilkie
force-pushed
the
520-edge-bug
branch
from
f0fb6e3 to
7e1a653
Compare
| c.RLock() | ||
| defer c.RUnlock() | ||
|
|
||
| ips := append(c.container.NetworkSettings.SecondaryIPAddresses, | ||
| c.container.NetworkSettings.IPAddress) |
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
|
LGTM. |
|
Crap; there is actually a good reason not to use the id generators - they embed the logic for whether a scope is appended or not, and really are only for use within the probe. Lets see if we can factor this out. |
tomwilkie
force-pushed
the
520-edge-bug
branch
from
52ddd19 to
e674d48
Compare
|
|
tomwilkie
force-pushed
the
520-edge-bug
branch
from
e674d48 to
ab76b9c
Compare
|
MakeScopedEndpointNodeID or the general form Make [Scoped] Topology Node ID |
tomwilkie
force-pushed
the
520-edge-bug
branch
from
ab76b9c to
1868e2b
Compare
|
Okay done. Hopefully this should all pass now. |
tomwilkie
force-pushed
the
520-edge-bug
branch
from
1868e2b to
cd97708
Compare
tomwilkie
added a commit
that referenced
this pull request
Oct 21, 2015
Include host scope for container joins based on IP.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Part of #520 - can explain false edges between containers on different hosts, but the bug has been seen between containers on the same host, and this shouldn't affect that.