Handle duplication during parser second pass (LP: #2007682)#329
Merged
slyon merged 5 commits intocanonical:mainfrom Mar 2, 2023
Merged
Handle duplication during parser second pass (LP: #2007682)#329slyon merged 5 commits intocanonical:mainfrom
slyon merged 5 commits intocanonical:mainfrom
Conversation
Contributor
Author
|
Well, it looks like the memory leak checker works! 😅 |
slyon
approved these changes
Mar 1, 2023
Contributor
slyon
left a comment
slyon
left a comment
There was a problem hiding this comment.
Nice work! This is mostly looking good to me. One remark and some nitpicks inline.
If you could split & squash your final "memoryleak fixes" commit into the corresponding previous commits, and do the same for the fixes for my inline remarks, we could make this PR a rebase & merge, instead of a squash merge, as I think the commits have a really nice structure with one logical change per commit.
slyon
changed the title
slyon
changed the title
added 5 commits
March 1, 2023 18:08
It will prevent that routing rules with exactly the same parameters are added to the list.
When the parser needs a second pass, DNS IP addresses and search domains are inserted a second time in their respective lists. Avoid it by checking if they are already in the list.
Now they are deduplicated by the parser.
The list of protocols and controllers will have duplicate items when the parser needs a second pass.
daniloegea
force-pushed
the
fix_lp2007682
branch
from
3f69b82 to
40bc64f
Compare
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
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.
Description
When the parser needs a second pass, some configuration is being added again to their respective lists. We handle these cases already in other places either by checking if the values are present in their data structures or checking if the number of nodes in the YAML subtree matches the number of values in the lists/hashes. The second approach doesn't work well though when the same interface is defined in another file with extra configuration (example LP: #2003061)
This PR addresses 5 cases of duplication:
The example below will generate duplicated data for the routing-policy, nameservers addresses and search domains:
Result:
The example below will generate ovs commands with duplicated protocols and controller addresses:
Result:
This behavior is also visible with
netplan get:This is the new behavior:
Checklist
make checksuccessfully.make check-coverage).