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

Avoid timeout of retry state #2901

Merged
merged 1 commit into from Mar 23, 2020
Merged

Avoid timeout of retry state #2901

merged 1 commit into from Mar 23, 2020

Conversation

ganmacs
Copy link
Member

@ganmacs ganmacs commented Mar 19, 2020

Which issue(s) this PR fixes:
Fixes https://travis-ci.org/github/fluent/fluentd/jobs/664260115#L1720

What this PR does / why we need it:

If it exceeds the retry limit, https://travis-ci.org/github/fluent/fluentd/jobs/664260115#L1720 can happen (setting nil to @retry).

if @retry.limit?

if i become over 10, @i.retry can be nil.

30.times do |i| # large enough
now = first_failure + 60 * 0.8 + 2 + i
Timecop.freeze( now )
@i.flush_thread_wakeup
break if @i.buffer.dequeued.size == 0
end

Docs Changes:

no need

Release Note:

no need

Signed-off-by: Yuta Iwama <ganmacs@gmail.com>
@ganmacs ganmacs self-assigned this Mar 19, 2020
@ganmacs ganmacs marked this pull request as ready for review March 19, 2020 08:48
Copy link
Contributor

@cosmo0920 cosmo0920 left a comment

Choose a reason for hiding this comment

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

Good catch! I'd also investigated how to fix this failing test case, but I didn't find it....

@ganmacs ganmacs merged commit 5f56080 into fluent:master Mar 23, 2020
@ganmacs ganmacs deleted the avoid-timeout branch March 23, 2020 08:44
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.

None yet

2 participants