Skip to content

vendor: github.com/fluent/fluent-logger-golang 1.6.1#42418

Merged
thaJeztah merged 1 commit into
moby:masterfrom
sparrc:update-fluent-logger
May 27, 2021
Merged

vendor: github.com/fluent/fluent-logger-golang 1.6.1#42418
thaJeztah merged 1 commit into
moby:masterfrom
sparrc:update-fluent-logger

Conversation

@sparrc

@sparrc sparrc commented May 25, 2021

Copy link
Copy Markdown

Updates the fluent logger library. Namely this fixes a couple places
where the library could panic when closing and writing to channels.

see fluentd PRs/issues:

closes #40829
closes #32567

Signed-off-by: Cam [email protected]

- What I did

I edited vendor.conf manually, then ran ./hack/vendor.sh

- How to verify it

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

@sparrc
sparrc force-pushed the update-fluent-logger branch 4 times, most recently from 1656ffe to 2963025 Compare May 25, 2021 17:49
@thaJeztah

Copy link
Copy Markdown
Member

I saw #42320 was also opened to fix #42316 (for all logging drivers)

/cc @cpuguy83 ptal

@sparrc

sparrc commented May 25, 2021

Copy link
Copy Markdown
Author

I see, should I remove #42316 from the list of "closed" issues from this PR? Sounds like maybe the root cause can be fixed beyond just preventing the fluentd library from panicking.

I've removed #42316 from the issues closed by this PR.

@sparrc
sparrc force-pushed the update-fluent-logger branch from 2963025 to 03112a8 Compare May 25, 2021 20:31
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]>
@sparrc
sparrc force-pushed the update-fluent-logger branch from 03112a8 to a6a98d6 Compare May 25, 2021 22:42
@sparrc

sparrc commented May 26, 2021

Copy link
Copy Markdown
Author

tests passed before I just amended the commit message. Now it's only failing on TestRestartDaemonWithRestartingContainer so I think this is a flaky test failure not related to this change.

@cpuguy83 cpuguy83 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM

@thaJeztah thaJeztah added this to the 21.xx milestone May 27, 2021

@thaJeztah thaJeztah left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM, thanks!

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.

SIGSEGV in github.com/fluent/fluent-logger-golang/fluent.(*Fluent).write Docker daemon crashes if fluentd daemon is gone and buffer is full

3 participants