Cancel Timeout Tasks and Fail tests if too many Timeouts #2204
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
2 tasks
bfish713
changed the title
bfish713
requested review from
DieracDelta,
shenkeyao,
elliedavidson and
rob-maron
shenkeyao
requested changes
Dec 13, 2023
crates/task-impls/src/consensus.rs
Outdated
Comment on lines
345
to
348
| #[cfg(async_executor_impl = "async-std")] | ||
| timeout_task.cancel().await; | ||
| #[cfg(async_executor_impl = "tokio")] | ||
| timeout_task.abort(); |
There was a problem hiding this comment.
Nit: Can we add a helper function to cancel the timeout task depending on their async executor, and use it to simplify places like this?
Comment on lines
236
to
239
| let num_decided = self.success_nodes.len(); | ||
| let num_failed = self.failed_nodes.len(); | ||
| let remaining_nodes = total_num_nodes - (num_decided + num_failed); | ||
| remaining_nodes + num_decided >= threshold |
There was a problem hiding this comment.
Looks like this function could be simplified as total_num_nodes - num_failed >= threshold, i.e., we don't need to calculate num_decided and remaining_nodes.
| @@ -108,7 +108,10 @@ async fn test_with_failures_half_f() { | |||
| metadata.spinning_properties = SpinningTaskDescription { | |||
| node_changes: vec![(5, dead_nodes)], | |||
| }; | |||
|
|
|||
| // TODO: this should only have 3 failures for each down leader, investigate why it fails additional views | |||
There was a problem hiding this comment.
Hmm, this is strange. It made sense before we set num_successful_views to 22, but now those 3 nodes should each fail only once.
shenkeyao
previously approved these changes
Dec 14, 2023
shenkeyao
approved these changes
Dec 15, 2023
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.
Closes #2165
This PR:
ViewTimedoutevent to the application when the consensus timeout task expiresThis PR does not:
num_failed_viewswas effectively infinite).Key places to review: