test,job: Fix deadlock in TestOneShot_RetryRecoverNoShutdown
#25293
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
This test asserts that the function under test is called again if the first call to the callback returned an error. A channel is used to signal to the test function that the callback has started, this signal being the closure of a channel. But channels are only allowed to be closed once, so the code would set the channel to `nil` after closing it and wrap the closing code in a nil-check. This works 99.999% of the time since the consumer of the channel will continue. However, it sometimes happens that the channel is set to `nil` before the consumers flow has been started, resulting in a deadlock since reading from a nil channel always blocks. So, to fix it, we now simply look at the `i` variable and don't set the channel to `nil` anymore. Signed-off-by: Dylan Reimerink <dylan.reimerink@isovalent.com>
tommyp1ckles
approved these changes
May 5, 2023
|
/test |
dylandreimerink
added
the
ready-to-merge
|
All codeowner teams covered and all tests green, marking ready-to-merge |
jrajahalme
approved these changes
May 8, 2023
maintainer-s-little-helper
bot
removed
the
ready-to-merge
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 test asserts that the function under test is called again if the first call to the callback returned an error. A channel is used to signal to the test function that the callback has started, this signal being the closure of a channel. But channels are only allowed to be closed once, so the code would set the channel to
nilafter closing it and wrap the closing code in a nil-check. This works 99.999% of the time since the consumer of the channel will continue. However, it sometimes happens that the channel is set tonilbefore the consumers flow has been started, resulting in a deadlock since reading from a nil channel always blocks. So, to fix it, we now simply look at theivariable and don't set the channel tonilanymore.Fixes: #25276