Fm backport/v1 #12254
Closed
Fm backport/v1 #12254
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
(cherry picked from commit f97b4ec)
In multi instance flow manager setups, each flow manager gets a slice of the hash table to manage. Due to a logic error in the chunked scanning of the hash slice, instances beyond the first would always rescan the same (first) subslice of their slice. The `pos` variable that is used to keep the state of what the starting position for the next scan was supposed to be, was treated as if it held a relative value. Relative to the bounds of the slice. It was however, holding an absolute position. This meant that when doing it's bounds check it was always considered out of bounds. This would reset the sub- slice to be scanned to the first part of the instances slice. This patch addresses the issue by correctly handling the fact that the value is absolute. Bug: OISF#7365. Fixes: e9d2417 ("flow/manager: adaptive hash eviction timing") (cherry picked from commit ae072d5)
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main-7.0.x #12254 +/- ##
===========================================
Coverage 83.19% 83.19%
===========================================
Files 922 922
Lines 260888 260888
===========================================
+ Hits 217048 217050 +2
+ Misses 43840 43838 -2
Flags with carried forward coverage won't be shown. Click here to find out more. |
jufajardini
approved these changes
Dec 9, 2024
Comment on lines
+387
to
392
| * \param td FM timeout thread instance | ||
| * \param f head of the evicted list | ||
| */ | ||
| static void FlowManagerHashRowClearEvictedList( | ||
| FlowManagerTimeoutThread *td, Flow *f, SCTime_t ts, FlowTimeoutCounters *counters) | ||
| { |
There was a problem hiding this comment.
Is it worth/ important to add the missing params to the docs, or not worthy waiting for another iteration? (I suppose not 🤔 )
jasonish
approved these changes
Dec 9, 2024
|
WARNING: ERROR: QA failed on SURI_TLPR1_alerts_cmp.
Pipeline 23765 |
|
Setting to draft to avoid merge before 7.0.8, as this is postponed to 7.0.9. |
This was referenced Dec 13, 2024
|
Merged in #12302, thanks! |
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.
FM fixes backport.