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

[20.10 backport] backport fluentd log driver async connect fix #43147

Merged
merged 3 commits into from Jan 20, 2022

Commits on Jan 13, 2022

  1. vendor: github.com/fluent/fluent-logger-golang 1.6.1

    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 <gh@sparr.email>
    (cherry picked from commit a6a98d6)
    Signed-off-by: Wesley <wppttt@amazon.com>
    sparrc authored and PettitWesley committed Jan 13, 2022
    Copy the full SHA
    d6f3add View commit details
    Browse the repository at this point in the history
  2. vendor: github.com/fluent/fluent-logger-golang v1.8.0

    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 <albinker@gmail.com>
    (cherry picked from commit e24d61b)
    Signed-off-by: Wesley <wppttt@amazon.com>
    akerouanton authored and PettitWesley committed Jan 13, 2022
    Copy the full SHA
    81fc02b View commit details
    Browse the repository at this point in the history
  3. fluentd: Turn ForceStopAsyncSend true when async connect is used

    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 <albinker@gmail.com>
    (cherry picked from commit bd61629)
    Signed-off-by: Wesley <wppttt@amazon.com>
    akerouanton authored and PettitWesley committed Jan 13, 2022
    1
    Copy the full SHA
    f9df098 View commit details
    Browse the repository at this point in the history