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

upstream_conn: fix ordering of mk_event_inject and prepare_conn_destroy #6842

Merged
merged 1 commit into from
Sep 26, 2024

Conversation

PettitWesley
Copy link
Contributor

@PettitWesley PettitWesley commented Feb 13, 2023

prepare_destroy_conn calls mk_list_del on the event in the priority bucket queue, so for safety, we inject it after this covers us against the case where the event was triggered and waiting, but we also reached the timeout.

Addresses this issue on 1.9: #6822

See the issue for a design doc on why this is needed

Signed-off-by: Wesley Pettit [email protected]


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.

prepare_destroy_conn calls mk_list_del on the event in the
priority bucket queue, so for safety, we inject it after
this covers us against the case where the event was triggered
and waiting, but we also reached the timeout.

Signed-off-by: Wesley Pettit <[email protected]>
@patrick-stephens
Copy link
Contributor

Looks like 1.9 branch also needs the updates to resolve the Github deprecation of set-output in workflows or ignore the linting failures for it (ActionLint is marking it as an error although it is not an actual failure until support for set-output is removed: https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/).

@PettitWesley PettitWesley temporarily deployed to pr February 13, 2023 19:17 — with GitHub Actions Inactive
@github-actions
Copy link
Contributor

This PR is stale because it has been open 45 days with no activity. Remove stale label or comment or this will be closed in 10 days.

@github-actions github-actions bot added the Stale label May 15, 2023
@edsiper edsiper added this to the Fluent Bit v3.2.0 milestone Sep 26, 2024
@edsiper edsiper merged commit 8ccc7bf into fluent:1.9 Sep 26, 2024
1 check passed
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.

4 participants