Fixed deadlock in injection_queue_depth_multi_thread test #6916
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
Darksonn
reviewed
Oct 18, 2024
tokio/tests/rt_metrics.rs
Outdated
| if i != depth { | ||
| fail = Some(format!("{i} is not equal to {depth}")); | ||
| break; | ||
| 'next_try: for _ in 0..10 { |
There was a problem hiding this comment.
We usually do this kind of retrying by defining two functions, to separate out the concerns.
There was a problem hiding this comment.
I abstracted the act of blocking the runtime into its own fallible function. Hope this is what you meant by separating the concerns, it felt to me like it fits into the general design of Tokio's integration test suite.
jofas
force-pushed
the
fix-flaky-injection-queue-test
branch
3 times, most recently
from
65ab87c
to
a406e7a
Compare
jofas
force-pushed
the
fix-flaky-injection-queue-test
branch
from
a406e7a
to
b692f53
Compare
This was referenced Oct 21, 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.
This closes #6847 by removing the deadlock from the test as discussed in #6876. The changes I made are based on this suggestion. I made the blocking tasks block by letting them wait on a message from a
std::mpscchannel. This is quite convenient IMO, because we can exit the blocking tasks simply by dropping allSenders of the channel.1Footnotes
Unlike the previous implementation that used
Barriers for synchronization—even if the test were to unforeseeably panic—the blocking tasks would still exit and cause the test to fail early instead of timing out. ↩