[exporterhelper] Fix potential deadlock in the batch sender #10315
Conversation
This file contains 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
|
@carsonip PTAL |
dmitryax
force-pushed
the
fix-batch-splitting
branch
2 times, most recently
from
8c3311d
to
d658832
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #10315 +/- ##
==========================================
- Coverage 92.58% 92.57% -0.01%
==========================================
Files 387 387
Lines 18254 18250 -4
==========================================
- Hits 16900 16895 -5
- Misses 1008 1009 +1
Partials 346 346 ☔ View full report in Codecov by Sentry. |
dmitryax
force-pushed
the
fix-batch-splitting
branch
from
d658832
to
09b2518
Compare
carsonip
reviewed
Jun 5, 2024
Concurrent handling of the flush timeouts can run into a deadlock when a batch is simultaneously sent by reaching the minimum size and flush timeout. The deadlock can happen on the following lines: - https://github.com/open-telemetry/opentelemetry-collector/blob/115bc8e28e009ca93565dc4deb4cf6608fa63622/exporter/exporterhelper/batch_sender.go#L131 - https://github.com/open-telemetry/opentelemetry-collector/blob/115bc8e28e009ca93565dc4deb4cf6608fa63622/exporter/exporterhelper/batch_sender.go#L87 Co-authored-by: Carson Ip <carsonip@users.noreply.github.com>
dmitryax
force-pushed
the
fix-batch-splitting
branch
from
db130ff
to
4ca2db6
Compare
|
Thanks @carsonip! |
atoulme
approved these changes
Jun 5, 2024
carsonip
approved these changes
Jun 5, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Concurrent handling of the flush timeouts can run into a deadlock when a batch is simultaneously sent by reaching the minimum size and flush timeout. The deadlock can happen on the following lines:
opentelemetry-collector/exporter/exporterhelper/batch_sender.go
Line 131 in 115bc8e
opentelemetry-collector/exporter/exporterhelper/batch_sender.go
Line 87 in 115bc8e