policy: Use 'insertOldIfNotExists() in addDependentOnEntry() #35109
Conversation
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
doniacld
approved these changes
Oct 2, 2024
7aec9e3 to
137abf7
Compare
Keep the oldest changed value in 'addDependentOnEntry()' by using 'insertOldIfNotExists()' rather than modifying 'changes.Old' directly. Changes in tests are due to the way 'insertOldIfNotExists()' filters out new entries (not adding an 'old' entry if the key exists in 'changes.Adds'). Test changes are in the 'deletes' field due to the test internally setting a 'deletes' key for each key in 'changes.Old'. Old key values are used when reverting a failed endpoint update, prior to this fix that revert may have produced incorrect results. Signed-off-by: Jarno Rajahalme <jarno@isovalent.com>
137abf7 to
71a810b
Compare
|
Resolved merge conflict due to visibility annotation removal. |
|
/test |
|
/ci-ginkgo |
giorio94
pushed a commit
that referenced
this pull request
Oct 7, 2024
[ upstream commit 3aad3f8 ] [ backporter's notes: hit minor conflict due to different surrounding context; accepted combination. Additionally updated the TestMapState_AccumulateMapChangesOnVisibilityKeys test, which has been removed in the meanwhile on main, applying the changes originally part of 137abf7b4b6a (from #35109). ] Keep the oldest changed value in 'addDependentOnEntry()' by using 'insertOldIfNotExists()' rather than modifying 'changes.Old' directly. Changes in tests are due to the way 'insertOldIfNotExists()' filters out new entries (not adding an 'old' entry if the key exists in 'changes.Adds'). Test changes are in the 'deletes' field due to the test internally setting a 'deletes' key for each key in 'changes.Old'. Old key values are used when reverting a failed endpoint update, prior to this fix that revert may have produced incorrect results. Signed-off-by: Jarno Rajahalme <jarno@isovalent.com> Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
giorio94
pushed a commit
that referenced
this pull request
Oct 7, 2024
[ upstream commit 3aad3f8 ] [ backporter's notes: hit minor conflict due to different surrounding context; accepted combination. Additionally updated the TestMapState_AccumulateMapChangesOnVisibilityKeys test, which has been removed in the meanwhile on main, applying the changes originally part of 137abf7b4b6a (from #35109). ] Keep the oldest changed value in 'addDependentOnEntry()' by using 'insertOldIfNotExists()' rather than modifying 'changes.Old' directly. Changes in tests are due to the way 'insertOldIfNotExists()' filters out new entries (not adding an 'old' entry if the key exists in 'changes.Adds'). Test changes are in the 'deletes' field due to the test internally setting a 'deletes' key for each key in 'changes.Old'. Old key values are used when reverting a failed endpoint update, prior to this fix that revert may have produced incorrect results. Signed-off-by: Jarno Rajahalme <jarno@isovalent.com> Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
giorio94
pushed a commit
that referenced
this pull request
Oct 7, 2024
[ upstream commit 3aad3f8 ] [ backporter's notes: hit minor conflict due to different surrounding context; accepted combination. Additionally updated the TestMapState_AccumulateMapChangesOnVisibilityKeys test, which has been removed in the meanwhile on main, applying the changes originally part of 137abf7b4b6a (from #35109). ] Keep the oldest changed value in 'addDependentOnEntry()' by using 'insertOldIfNotExists()' rather than modifying 'changes.Old' directly. Changes in tests are due to the way 'insertOldIfNotExists()' filters out new entries (not adding an 'old' entry if the key exists in 'changes.Adds'). Test changes are in the 'deletes' field due to the test internally setting a 'deletes' key for each key in 'changes.Old'. Old key values are used when reverting a failed endpoint update, prior to this fix that revert may have produced incorrect results. Signed-off-by: Jarno Rajahalme <jarno@isovalent.com> Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
aanm
pushed a commit
that referenced
this pull request
Oct 8, 2024
[ upstream commit 3aad3f8 ] [ backporter's notes: hit minor conflict due to different surrounding context; accepted combination. Additionally updated the TestMapState_AccumulateMapChangesOnVisibilityKeys test, which has been removed in the meanwhile on main, applying the changes originally part of 137abf7b4b6a (from #35109). ] Keep the oldest changed value in 'addDependentOnEntry()' by using 'insertOldIfNotExists()' rather than modifying 'changes.Old' directly. Changes in tests are due to the way 'insertOldIfNotExists()' filters out new entries (not adding an 'old' entry if the key exists in 'changes.Adds'). Test changes are in the 'deletes' field due to the test internally setting a 'deletes' key for each key in 'changes.Old'. Old key values are used when reverting a failed endpoint update, prior to this fix that revert may have produced incorrect results. Signed-off-by: Jarno Rajahalme <jarno@isovalent.com> Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
aanm
pushed a commit
that referenced
this pull request
Oct 8, 2024
[ upstream commit 3aad3f8 ] [ backporter's notes: hit minor conflict due to different surrounding context; accepted combination. Additionally updated the TestMapState_AccumulateMapChangesOnVisibilityKeys test, which has been removed in the meanwhile on main, applying the changes originally part of 137abf7b4b6a (from #35109). ] Keep the oldest changed value in 'addDependentOnEntry()' by using 'insertOldIfNotExists()' rather than modifying 'changes.Old' directly. Changes in tests are due to the way 'insertOldIfNotExists()' filters out new entries (not adding an 'old' entry if the key exists in 'changes.Adds'). Test changes are in the 'deletes' field due to the test internally setting a 'deletes' key for each key in 'changes.Old'. Old key values are used when reverting a failed endpoint update, prior to this fix that revert may have produced incorrect results. Signed-off-by: Jarno Rajahalme <jarno@isovalent.com> Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
github-merge-queue bot
pushed a commit
that referenced
this pull request
Oct 8, 2024
[ upstream commit 3aad3f8 ] [ backporter's notes: hit minor conflict due to different surrounding context; accepted combination. Additionally updated the TestMapState_AccumulateMapChangesOnVisibilityKeys test, which has been removed in the meanwhile on main, applying the changes originally part of 137abf7b4b6a (from #35109). ] Keep the oldest changed value in 'addDependentOnEntry()' by using 'insertOldIfNotExists()' rather than modifying 'changes.Old' directly. Changes in tests are due to the way 'insertOldIfNotExists()' filters out new entries (not adding an 'old' entry if the key exists in 'changes.Adds'). Test changes are in the 'deletes' field due to the test internally setting a 'deletes' key for each key in 'changes.Old'. Old key values are used when reverting a failed endpoint update, prior to this fix that revert may have produced incorrect results. Signed-off-by: Jarno Rajahalme <jarno@isovalent.com> Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
This was referenced Oct 8, 2024
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.
Keep the oldest changed value in 'addDependentOnEntry()' by using 'insertOldIfNotExists()' rather than modifying 'changes.Old' directly. Changes in tests are due to the way 'insertOldIfNotExists()' filters out new entries (not adding an 'old' entry if the key exists in 'changes.Adds'). Test changes are in the 'deletes' field due to the test internally setting a 'deletes' key for each key in 'changes.Old'.
Old key values are used when reverting a failed endpoint update, prior to this fix that revert may have produced incorrect results.