Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

next/674/70x/20241217/v1 #12302

Merged
merged 2 commits into from
Dec 18, 2024

Conversation

victorjulien
Copy link
Member

inashivb and others added 2 commits December 17, 2024 22:05
(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)
Copy link

codecov bot commented Dec 17, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 83.21%. Comparing base (e5ebe36) to head (9e24f12).
Report is 2 commits behind head on main-7.0.x.

Additional details and impacted files
@@             Coverage Diff             @@
##           main-7.0.x   #12302   +/-   ##
===========================================
  Coverage       83.21%   83.21%           
===========================================
  Files             922      922           
  Lines          261173   261173           
===========================================
+ Hits           217338   217343    +5     
+ Misses          43835    43830    -5     
Flag Coverage Δ
fuzzcorpus 64.21% <0.00%> (+<0.01%) ⬆️
suricata-verify 63.45% <100.00%> (-0.02%) ⬇️
unittests 62.37% <0.00%> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

@suricata-qa
Copy link

Information:

ERROR: QA failed on SURI_TLPR1_alerts_cmp.

field baseline test %
SURI_TLPR1_stats_chk
.app_layer.flow.ftp 33163 36871 111.18%
.app_layer.error.http.parser 699 728 104.15%
.app_layer.error.ssh.parser 124 128 103.23%

Pipeline 23982

Copy link
Member

@inashivb inashivb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🚀

@victorjulien victorjulien added the needs baseline update QA will need a new base line label Dec 18, 2024
@victorjulien
Copy link
Member Author

@ct0br0 can you let me know when you are ready to update the baseline?

@victorjulien victorjulien merged commit 9e24f12 into OISF:main-7.0.x Dec 18, 2024
45 checks passed
@victorjulien victorjulien mentioned this pull request Dec 18, 2024
@victorjulien victorjulien deleted the next/674/70x/20241217/v1 branch December 18, 2024 21:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs baseline update QA will need a new base line
Development

Successfully merging this pull request may close these issues.

3 participants