output-json: drop eve records that are too long #12165
Closed
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
In the situation where the mem buffer cannot be expanded to the requested size, drop the log message. For each JSON log context, a warning will be emitted once with a partial bit of the log record being dropped to identify what event types may be leading to large log records. This also fixes the call to MemBufferExpand which is supposed be passed the amount to expand by, not the new size required. Ticket: OISF#7300
The return value was never used.
jasonish
changed the title
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #12165 +/- ##
==========================================
+ Coverage 49.81% 49.83% +0.02%
==========================================
Files 909 909
Lines 257904 257911 +7
==========================================
+ Hits 128467 128542 +75
+ Misses 129437 129369 -68
Flags with carried forward coverage won't be shown. Click here to find out more. |
|
Information: QA ran without warnings. Pipeline 23585 |
| @@ -981,13 +981,23 @@ int OutputJsonBuilderBuffer( | |||
| size_t jslen = jb_len(js); | |||
| DEBUG_VALIDATE_BUG_ON(jb_len(js) > UINT32_MAX); | |||
| if (MEMBUFFER_OFFSET(*buffer) + jslen >= MEMBUFFER_SIZE(*buffer)) { | |||
| MemBufferExpand(buffer, (uint32_t)jslen); | |||
| size_t expand_by = MEMBUFFER_OFFSET(*buffer) + jslen + 1; | |||
There was a problem hiding this comment.
git message says "This also fixes the call to MemBufferExpand which is supposed be
passed the amount to expand by, not the new size required." , however it seems the opposite happens here: total is passed.
Wonder if we should just grow to a next multiple of 4k (or PAGESIZE) that fits
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.
output-json: drop eve records that are too long
In the situation where the mem buffer cannot be expanded to the
requested size, drop the log message.
For each JSON log context, a warning will be emitted once with a partial
bit of the log record being dropped to identify what event types may be
leading to large log records.
This also fixes the call to MemBufferExpand which is supposed be
passed the amount to expand by, not the new size required.
Ticket: https://redmine.openinfosecfoundation.org/issues/7300
output-json: cleanup, have OutputJsonBuilderBuffer return void
The return value was never used.