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.

Sign up for GitHub

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

Fm row fix/v3 #12218

Closed
wants to merge 2 commits into from
Closed

Fm row fix/v3 #12218

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3616f55
flow/manager: fix multi instance row tracking
victorjulien Dec 3, 2024
3c01abf
flow/manager: add chunk debug output
victorjulien Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions src/flow-manager.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,21 +500,22 @@ static uint32_t FlowTimeoutHash(FlowManagerTimeoutThread *td, SCTime_t ts, const
* \param hash_max upper bound of the row slice
* \param counters Flow timeout counters to be passed
* \param rows number of rows for this worker unit
* \param pos position of the beginning of row slice in the hash table
* \param pos absolute position of the beginning of row slice in the hash table
* \param instance instance id of this FM
*
* \retval number of successfully timed out flows
*/
static uint32_t FlowTimeoutHashInChunks(FlowManagerTimeoutThread *td, SCTime_t ts,
const uint32_t hash_min, const uint32_t hash_max, FlowTimeoutCounters *counters,
const uint32_t rows, uint32_t *pos)
const uint32_t rows, uint32_t *pos, const uint32_t instance)
{
uint32_t start = 0;
uint32_t end = 0;
uint32_t cnt = 0;
uint32_t rows_left = rows;

again:
start = hash_min + (*pos);
start = (*pos);
if (start >= hash_max) {
start = hash_min;
}
Expand All @@ -525,6 +526,9 @@ static uint32_t FlowTimeoutHashInChunks(FlowManagerTimeoutThread *td, SCTime_t t
*pos = (end == hash_max) ? hash_min : end;
rows_left = rows_left - (end - start);

SCLogDebug("instance %u: %u:%u (hash_min %u, hash_max %u *pos %u)", instance, start, end,
hash_min, hash_max, *pos);

cnt += FlowTimeoutHash(td, ts, start, end, counters);
if (rows_left) {
goto again;
Expand Down Expand Up @@ -795,7 +799,7 @@ static TmEcode FlowManager(ThreadVars *th_v, void *thread_data)

uint32_t emerg_over_cnt = 0;
uint64_t next_run_ms = 0;
uint32_t pos = 0;
uint32_t pos = ftd->min;
uint32_t rows_sec = 0;
uint32_t rows_per_wu = 0;
uint64_t sleep_per_wu = 0;
Expand Down Expand Up @@ -859,8 +863,8 @@ static TmEcode FlowManager(ThreadVars *th_v, void *thread_data)
rows_per_wu);

const uint32_t ppos = pos;
FlowTimeoutHashInChunks(
&ftd->timeout, ts, ftd->min, ftd->max, &counters, rows_per_wu, &pos);
FlowTimeoutHashInChunks(&ftd->timeout, ts, ftd->min, ftd->max, &counters,
rows_per_wu, &pos, ftd->instance);
if (ppos > pos) {
StatsIncr(th_v, ftd->cnt.flow_mgr_full_pass);
}
Expand Down
Loading