Update topology mapping Refs on all proxy instance deletions #9589
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
dnephin
approved these changes
Jan 19, 2021
Comment on lines
+3281
to
+3282
| if _, ok := copy.Refs[uid]; !ok { | ||
| continue |
There was a problem hiding this comment.
I guess this could be done on the entry so that we skip the deep copy in this case? Probably a minor optimization.
preetapan
reviewed
Jan 20, 2021
|
🍒 If backport labels were added before merging, cherry-picking will start automatically. To retroactively trigger a backport after merging, add backport labels and re-run https://circleci.com/gh/hashicorp/consul/312876. |
|
🍒✅ Cherry pick of commit e50019b onto |
hashicorp-ci
pushed a commit
that referenced
this pull request
Jan 20, 2021
* Insert new upstream/downstream mapping to persist new Refs * Avoid upserting mapping copy if it's a no-op * Add test with panic repro * Avoid deleting up/downstreams from inside memdb iterator * Avoid deleting gateway mappings from inside memdb iterator * Add CHANGELOG entry * Tweak changelog entry Co-authored-by: Paul Banks <banks@banksco.de>
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.
To keep track of upstream/downstream pairings for the mesh topology visualization we keep the mapping stored in memdb. This pairing mapping contains a map with a reference to every proxy ID that contains this pair in its service definition.
As proxy instances are deregistered, this map needs to be updated to remove that reference for the pairing.
Currently that map is not being updated on deletions when the proxy ID being registered is not the last instance for that proxy name.
This PR ensures we persist the new reference map when proxy IDs are deregistered, and fixes the broken assertion in the relevant test.
Fixes: #9566