Fix duplicate subnet allocations#48084
Merged
thaJeztah merged 1 commit intomoby:masterfrom Jun 28, 2024
Merged
Conversation
faca22b to
4849786
Compare
Keep allocated subnets in-order, so that they're not mistakenly reallocated due to a gap in the list where misplaced subnets should have been. Introduced in 9d288b5. The iterator over allocated subnets was incremented too early, this change moves it past three clauses in addrSpace.allocatePredefinedPool(). The three new unit tests correspond to a separate failure caused by incrementing before each of them. Signed-off-by: Rob Murray <[email protected]>
4849786 to
4de54ee
Compare
corhere
approved these changes
Jun 28, 2024
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
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.
- What I did
Keep allocated subnets in-order, so that they're not mistakenly reallocated due to a gap in the list where misplaced subnets should have been.
- How I did it
The iterator over allocated subnets was incremented too early, this change moves it past three clauses in addrSpace.allocatePredefinedPool().
- How to verify it
The three new unit tests correspond to a separate failure caused by incrementing before each of them.
Without the fix, the three new tests fail like this ...
As a follow-up, it might be good to add something to the tests to assert that
allocatedis ordered (and maybe to the production code to log an error if the ordering breaks).- Description for the changelog