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

input_chunk: handle filter_do edge case #8229

Merged
merged 2 commits into from
Dec 16, 2023
Merged

input_chunk: handle filter_do edge case #8229

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37cb10d
input_chunk: handle filter_do edge case
braydonk Nov 28, 2023
8543d12
input_chunk: clarify comment
braydonk Nov 28, 2023
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
21 changes: 17 additions & 4 deletions src/flb_input_chunk.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1376,7 +1376,7 @@ static int input_chunk_append_raw(struct flb_input_instance *in,
const char *tag, size_t tag_len,
const void *buf, size_t buf_size)
{
int ret;
int ret, total_records_start;
int set_down = FLB_FALSE;
int min;
int new_chunk = FLB_FALSE;
Expand Down Expand Up @@ -1495,6 +1495,15 @@ static int input_chunk_append_raw(struct flb_input_instance *in,
pre_real_size = flb_input_chunk_get_real_size(ic);
}

/*
* Set the total_records based on the records that n_records
* says we should be writing. This may be modified by flb_filter_do,
* where a filter may add/remove records.
braydonk marked this conversation as resolved.
Show resolved Hide resolved
*/
total_records_start = ic->total_records;
ic->added_records = n_records;
ic->total_records += n_records;

#ifdef FLB_HAVE_CHUNK_TRACE
flb_chunk_trace_do_input(ic);
#endif /* FLB_HAVE_CHUNK_TRACE */
Expand Down Expand Up @@ -1530,9 +1539,13 @@ static int input_chunk_append_raw(struct flb_input_instance *in,
flb_free(filtered_data_buffer);
}

if (ret == CIO_OK) {
ic->added_records = n_records;
ic->total_records += n_records;
/*
* If the write failed, then we did not add any records. Reset
* the record counters to reflect this.
*/
if (ret != CIO_OK) {
ic->added_records = 0;
ic->total_records = total_records_start;
}

/* Update 'input' metrics */
Expand Down
Loading