input_chunk: update records in the right place #8223
Merged
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 commit ac4ec1f, the input chunk writing was moved down from the previous spot to be below where input metrics are update. This PR moves the metric update below the input chunk write so that the `ret == CIO_OK` check is actually right, and so that the metrics are only updated after the write has occurred. I also moved adding to `total_records` outside of the metric ifdef. This appears to have been here for some time, but there are numerous output plugins that rely on `event_chunk->total_events`, which is set from this total_records value. This will mean it always gets updated, even if metrics are disabled. Signed-off-by: braydonk <braydonk@google.com>
braydonk
requested review from
edsiper,
leonardo-albertovich,
fujimotos and
koleini
as code owners
|
@leonardo-albertovich please review if you can to make sure this fix makes sense with your original commit. |
braydonk
commented
Nov 27, 2023
| @@ -1499,31 +1499,6 @@ static int input_chunk_append_raw(struct flb_input_instance *in, | |||
| flb_chunk_trace_do_input(ic); | |||
| #endif /* FLB_HAVE_CHUNK_TRACE */ | |||
|
|
|||
| /* Update 'input' metrics */ | |||
| #ifdef FLB_HAVE_METRICS | |||
| if (ret == CIO_OK) { | |||
There was a problem hiding this comment.
When in this spot, this check would fail because the last time ret is set is by a function that returns CIO_TRUE. CIO_TRUE is a !0 macro. CIO_OK is 0, meaning this check would always fail when flb_chunk_is_up or cio_chunk_up_force succeeded.
`total_events` is expected to be set even in scenarios where `FLB_HAVE_METRICS` is not defined. Remove the guard around actually setting that value from the input chunk. Signed-off-by: braydonk <braydonk@google.com>
Adds a test that checks whether the input chunk that was created during the test has a `total_records` value set. Signed-off-by: braydonk <braydonk@google.com>
leonardo-albertovich
previously approved these changes
Nov 28, 2023
|
The macos jemalloc tests seem to be the same flakes that are always happening and are unrelated to the PR. |
Similarly to other spots, total_records is expected to be set in a few plugins outside of FLB_HAVE_METRICS definitions. This makes it so when this value is set on filter, it happens outside of the definition so that filters that change the size of total_records will still have the values reflected. Signed-off-by: braydonk <braydonk@google.com>
|
thank you |
9 tasks
This was referenced Dec 3, 2023
9 tasks
Open
1 task
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.
In commit ac4ec1f, the input chunk writing was moved down from the previous spot to be below where input metrics are updated. This PR moves the metric update below the input chunk write so that the
ret == CIO_OKcheck is actually right, and so that the metrics are only updated after the write has occurred.I also moved adding to
total_recordsoutside of the metric ifdef. This appears to have been here for some time, but there are numerous output plugins that rely onevent_chunk->total_events, which is set from this total_records value. This will mean it always gets updated, even if metrics are disabled.Enter
[N/A]in the box, if an item is not applicable to your change.Testing
Before we can approve your change; please submit the following in a comment:
If this is a change to packaging of containers or native binaries then please confirm it works for all targets.
ok-package-testlabel to test for all targets (requires maintainer to do).Documentation
Backporting
Fluent Bit is licensed under Apache 2.0, by submitting this pull request I understand that this code will be released under the terms of that license.