test: fix unstable buffer test #4849
Merged
Conversation
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
daipom
added
CI
The max size of queue is `1` by default.
So, `try_flush` will be called with `flush_thread_interval`, not
`flush_thread_burst_interval`.
The previous test code assumes that the interval is 0.1s, but
it was actually 1s.
This would be the cause of the occasional failure.
test: #write is called per value combination of variables, per flush_interval & chunk sizes, and buffer chunk is purged(BufferedOutputTest::buffered output feature with variables):
assert{ @i.buffer.stage.size == 0 }
| | | | |
| | | | false
| | | 1
| | {...}
| #<...>
#<...>
/Users/runner/work/fluentd/fluentd/test/plugin/test_output_as_buffered.rb:1459:in `block (2 levels) in <class:BufferedOutputTest>'
1456: @i.enqueue_thread_wait
1457: @i.flush_thread_wakeup
1458:
=> 1459: assert{ @i.buffer.stage.size == 0 }
1460:
1461: waiting(4) do
1462: Thread.pass until @i.write_count > 1
Signed-off-by: Daijiro Fukuda <[email protected]>
daipom
force-pushed
the
test-fix-unstable-buffer-test
branch
from
0cbe64a to
f8bb618
Compare
daipom
added a commit
that referenced
this pull request
Mar 6, 2025
**Which issue(s) this PR fixes**: None. **What this PR does / why we need it**: Fix occasional test failure: https://github.com/fluent/fluentd/actions/runs/13650069134/job/38156420830?pr=4846#step:6:4985 The max size of the buffer queue is `1` by default. So, `try_flush` will be called with `flush_thread_interval`, not `flush_thread_burst_interval`. The previous test code assumes that the interval is 0.1s, but it was actually 1s. This would be the cause of the occasional failure. test: #write is called per value combination of variables, per flush_interval & chunk sizes, and buffer chunk is purged(BufferedOutputTest::buffered output feature with variables): assert{ @i.buffer.stage.size == 0 } | | | | | | | | | false | | | 1 | | {...} | #<...> #<...> /Users/runner/work/fluentd/fluentd/test/plugin/test_output_as_buffered.rb:1459:in `block (2 levels) in <class:BufferedOutputTest>' 1456: @i.enqueue_thread_wait 1457: @i.flush_thread_wakeup 1458: => 1459: assert{ @i.buffer.stage.size == 0 } 1460: 1461: waiting(4) do 1462: Thread.pass until @i.write_count > 1 **Docs Changes**: Not needed. **Release Note**: Not needed. Signed-off-by: Daijiro Fukuda <[email protected]>
daipom
added a commit
that referenced
this pull request
Mar 6, 2025
**Which issue(s) this PR fixes**: * Backport #4849 **What this PR does / why we need it**: Fix occasional test failure: https://github.com/fluent/fluentd/actions/runs/13650069134/job/38156420830?pr=4846#step:6:4985 The max size of the buffer queue is `1` by default. So, `try_flush` will be called with `flush_thread_interval`, not `flush_thread_burst_interval`. The previous test code assumes that the interval is 0.1s, but it was actually 1s. This would be the cause of the occasional failure. test: #write is called per value combination of variables, per flush_interval & chunk sizes, and buffer chunk is purged(BufferedOutputTest::buffered output feature with variables): assert{ @i.buffer.stage.size == 0 } | | | | | | | | | false | | | 1 | | {...} | #<...> #<...> /Users/runner/work/fluentd/fluentd/test/plugin/test_output_as_buffered.rb:1459:in `block (2 levels) in <class:BufferedOutputTest>' 1456: @i.enqueue_thread_wait 1457: @i.flush_thread_wakeup 1458: => 1459: assert{ @i.buffer.stage.size == 0 } 1460: 1461: waiting(4) do 1462: Thread.pass until @i.write_count > 1 **Docs Changes**: Not needed. **Release Note**: Not needed. Signed-off-by: Daijiro Fukuda <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Which issue(s) this PR fixes:
None.
What this PR does / why we need it:
Fix occasional test failure: https://github.com/fluent/fluentd/actions/runs/13650069134/job/38156420830?pr=4846#step:6:4985
The max size of the buffer queue is
1by default.So,
try_flushwill be called withflush_thread_interval, notflush_thread_burst_interval.The previous test code assumes that the interval is 0.1s, but it was actually 1s.
This would be the cause of the occasional failure.
Docs Changes:
Not needed.
Release Note:
Not needed.