-
Notifications
You must be signed in to change notification settings - Fork 1.6k
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
in_docker: fix error handling if some resources not found #5189
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
Signed-off-by: Takahiro Yamashita <[email protected]>
nokute78
commented
Mar 26, 2022
@@ -791,7 +818,12 @@ static int cb_docker_collect(struct flb_input_instance *ins, | |||
snaps = get_docker_stats(ctx, filtered); | |||
if (!snaps) { | |||
free_docker_list(active); | |||
free_docker_list(filtered); | |||
if (active != filtered) { | |||
/* apply_filters can return the address of acive. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
tarruda
pushed a commit
to tarruda/fluent-bit
that referenced
this pull request
Mar 28, 2022
close fluent#5189 Signed-off-by: Thiago Padilha <[email protected]>
tarruda
pushed a commit
to tarruda/fluent-bit
that referenced
this pull request
Apr 1, 2022
close fluent#5189 Signed-off-by: Thiago Padilha <[email protected]>
tarruda
pushed a commit
to tarruda/fluent-bit
that referenced
this pull request
Apr 6, 2022
close fluent#5189 Signed-off-by: Thiago Padilha <[email protected]>
tarruda
pushed a commit
to tarruda/fluent-bit
that referenced
this pull request
Apr 6, 2022
close fluent#5189 Signed-off-by: Thiago Padilha <[email protected]>
mgeriesa
pushed a commit
to mgeriesa/fluent-bit
that referenced
this pull request
Oct 25, 2022
Signed-off-by: Takahiro Yamashita <[email protected]> Signed-off-by: Manal Geries <[email protected]>
demonccc
pushed a commit
to demonccc/fluent-bit
that referenced
this pull request
Feb 14, 2023
Signed-off-by: Takahiro Yamashita <[email protected]> Signed-off-by: a445943 <[email protected]>
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.
This patch is to add NULL check to prevent SIGSEGV which is reported at #5149
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.
Documentation
Backporting
Configuration
sudo fluent-bit -i docker -o stdout
Debug log
I tested renaming invalid cpu resource file name.
No SIGSEGVs.
Valgrind output
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.