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.

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

utils: suppress errno when file is empty but readable. #7837

Merged
merged 2 commits into from
Sep 4, 2023

Conversation

pwhelan
Copy link
Contributor

@pwhelan pwhelan commented Aug 17, 2023

Summary

Suppress a false error log when flb_utils_read_file reads empty files. This affects custom_calyptia when it attempts to read /etc/machine-id inside docker containers when it is present but empty.


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:

  • Example configuration file for the change
  • Debug log output from testing the change
  • Attached Valgrind output that shows no leaks or memory corruption was found

If this is a change to packaging of containers or native binaries then please confirm it works for all targets.

  • Run local packaging test showing all targets (including any new ones) build.
  • Set ok-package-test label to test for all targets (requires maintainer to do).

Documentation

  • Documentation required for this feature

Backporting

  • Backport to latest stable release.

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.

@pwhelan pwhelan temporarily deployed to pr August 17, 2023 16:08 — with GitHub Actions Inactive
@pwhelan pwhelan temporarily deployed to pr August 17, 2023 16:08 — with GitHub Actions Inactive
@pwhelan pwhelan temporarily deployed to pr August 17, 2023 16:09 — with GitHub Actions Inactive
@pwhelan pwhelan temporarily deployed to pr August 17, 2023 16:35 — with GitHub Actions Inactive
src/flb_utils.c Outdated Show resolved Hide resolved
@pwhelan pwhelan requested a review from nokute78 August 28, 2023 14:59
Copy link
Member

@edsiper edsiper left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also please fix the commit prefix, it should be utils: ...

src/flb_utils.c Outdated Show resolved Hide resolved
@edsiper edsiper added this to the Fluent Bit v2.1.9 milestone Aug 29, 2023
Suppress a false error log when flb_utils_read_file reads empty files.

Signed-off-by: Phillip Whelan <[email protected]>
@pwhelan pwhelan force-pushed the pwhelan-fix-error-flbs_utils_read_file-empty-files branch from 36898d0 to 37634df Compare August 29, 2023 15:17
@pwhelan pwhelan temporarily deployed to pr August 29, 2023 15:17 — with GitHub Actions Inactive
@pwhelan pwhelan temporarily deployed to pr August 29, 2023 15:17 — with GitHub Actions Inactive
@pwhelan pwhelan temporarily deployed to pr August 29, 2023 15:17 — with GitHub Actions Inactive
@pwhelan pwhelan temporarily deployed to pr August 29, 2023 15:49 — with GitHub Actions Inactive
@pwhelan pwhelan changed the title flb_utils: suppress errno when file is empty but readable. utils: suppress errno when file is empty but readable. Aug 29, 2023
@pwhelan pwhelan requested a review from edsiper August 30, 2023 15:51
@edsiper edsiper merged commit 1a1280b into master Sep 4, 2023
18 of 20 checks passed
@edsiper edsiper deleted the pwhelan-fix-error-flbs_utils_read_file-empty-files branch September 4, 2023 16:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants