[20.10 backport] backport fluentd log driver async connect fix#43147
Merged
Conversation
thaJeztah
changed the title
Member
|
Thanks! Wondering if we should
let me also ping @samuelkarp for the above, and for review 👍 |
Updates the fluent logger library. Namely this fixes a couple places where the library could panic when closing and writing to channels. see fluent/fluent-logger-golang#93 and fluent/fluent-logger-golang#95 closes moby#40829 closes moby#32567 Signed-off-by: Cam <[email protected]> (cherry picked from commit a6a98d6) Signed-off-by: Wesley <[email protected]>
Updates the fluent logger library to v1.8.0. Following PRs/commits were merged since last bump: * [Add callback for error handling when using async](fluent/fluent-logger-golang#97) * [Fix panic when accessing unexported struct field](fluent/fluent-logger-golang#99) * [Properly stop logger during (re)connect failure](fluent/fluent-logger-golang#82) * [Support a TLS-enabled connection](fluent/fluent-logger-golang@e5d6aa1) See https://github.com/fluent/fluent-logger-golang/compare/v1.6.1..v1.8.0 Signed-off-by: Albin Kerouanton <[email protected]> (cherry picked from commit e24d61b) Signed-off-by: Wesley <[email protected]>
The flag ForceStopAsyncSend was added to fluent logger lib in v1.5.0 (at this time named AsyncStop) to tell fluentd to abort sending logs asynchronously as soon as possible, when its Close() method is called. However this flag was broken because of the way the lib was handling it (basically, the lib could be stucked in retry-connect loop without checking this flag). Since fluent logger lib v1.7.0, calling Close() (when ForceStopAsyncSend is true) will really stop all ongoing send/connect procedure, wherever it's stucked. Signed-off-by: Albin Kerouanton <[email protected]> (cherry picked from commit bd61629) Signed-off-by: Wesley <[email protected]>
PettitWesley
force-pushed
the
backport-fluentd-fix
branch
from
January 13, 2022 01:50
8725d8e to
f9df098
Compare
Contributor
Author
|
@thaJeztah Fixed the commits as requested. |
tianon
approved these changes
Jan 13, 2022
samuelkarp
approved these changes
Jan 15, 2022
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
cherry picks of:
Currently, the fix for the issue is only merged into master. We want to get released sooner if possible.
This issue shows the impact for AWS customers: aws/amazon-ecs-agent#2787
And this comment in that issue shows how I tested both the original PR and this backport: aws/amazon-ecs-agent#2787 (comment)