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

Merge v1.12.4 into master #3395

Merged
merged 5 commits into from
May 26, 2021
Merged

Merge v1.12.4 into master #3395

merged 5 commits into from
May 26, 2021

Conversation

ashie
Copy link
Member

@ashie ashie commented May 26, 2021

Which issue(s) this PR fixes:
Fixes #3391, #3365

What this PR does / why we need it:
Merge changes in v1.12.4 into master

Docs Changes:
none

Release Note:
none

cosmo0920 and others added 5 commits May 26, 2021 13:09
In the previous Fluentd v1.11.x implementation uses path based tailing
keys.
We wouldn't rewrite tailing mechanism entirely.
And also we're implicitly assuming path based equality for TargetInfo in tailing logic.
We should handle TargetInfo with path based equality instead of path and
inode based equality.

Signed-off-by: Hiroshi Hatake <[email protected]>
in_tail: position_file: Define path based equalities on TargetInfo (for v1.12)
Signed-off-by: Takuro Ashie <[email protected]>
@ashie
Copy link
Member Author

ashie commented May 26, 2021

Review is already done at #3391.
I'll merge this after CI is finished.

@cosmo0920
Copy link
Contributor

Let's :shipit: after CIs are finished.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants