Fix not dedup Priorities in batch register #1841
Merged
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
antoninbas
previously approved these changes
Feb 9, 2021
Comment on lines
307
to
315
| assert.Equalf(t, nil, err, "Error occurred in priority registration") | ||
| _, _, err2 := pa2.RegisterPriorities(prioritiesToRegisterDuplicate) | ||
| assert.Equalf(t, nil, err2, "Error occurred in priority registration") | ||
| ofPriority1130, _ := pa1.GetOFPriority(p1130) | ||
| ofPriority1130Dup, _ := pa2.GetOFPriority(p1130) | ||
| assert.Equal(t, ofPriority1130, ofPriority1130Dup) | ||
| ofPriority1131, _ := pa1.GetOFPriority(p1131) | ||
| ofPriority1131Dup, _ := pa2.GetOFPriority(p1131) | ||
| assert.Equal(t, ofPriority1131, ofPriority1131Dup) |
There was a problem hiding this comment.
please use assert.NoError(t, err, ...) for errors
There was a problem hiding this comment.
Fixed for the entire test file.
Dyanngg
force-pushed
the
fix-dup-priority-batch-register
branch
from
09499fa
to
8275976
Compare
|
/test-all |
Codecov Report
@@ Coverage Diff @@
## main #1841 +/- ##
=======================================
Coverage ? 42.88%
=======================================
Files ? 196
Lines ? 16658
Branches ? 0
=======================================
Hits ? 7143
Misses ? 8510
Partials ? 1005
Flags with carried forward coverage won't be shown. Click here to find out more. |
antoninbas
pushed a commit
to antoninbas/antrea
that referenced
this pull request
Feb 10, 2021
antoninbas
pushed a commit
to antoninbas/antrea
that referenced
this pull request
Feb 10, 2021
antoninbas
pushed a commit
to antoninbas/antrea
that referenced
this pull request
Feb 11, 2021
antoninbas
pushed a commit
that referenced
this pull request
Feb 11, 2021
antoninbas
pushed a commit
that referenced
this pull request
Feb 11, 2021
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.
When Antrea agent is restarted, all Antrea-native policy priorities will be registered in batch. On a specific Node, there can be a large number of Antrea-native policies of the same Tier and policy priority. Hence, the list of types.Priority to be registered can contain duplicates, but it is not correctly handled by the priorityAssigner. Hence, the resulting ofPriority for a specific policy Priority can be inconsistent between batch registration and individual registration. This PR fixes this issue.