This repository has been archived by the owner on Nov 15, 2023. It is now read-only.
Dispute coordinator - Recover disputes on startup #3481
Merged
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 commit introduces a resume capability for the dispute coordinator subsystem. Specifically, this will allow to recover data for disputes for which we have no local statements.
… Harness This commit modifies the TestHarness to return a TestState. We subsequently define a resume function on TestState that allows to interrupt the test and test specifically for behavior on startup of the subsystem.
This commit implements the resume functionality for the subsystem. In addition, we will forward any DisputeParticipation::Participate message in order to ensure that disputes for which we do not have local statements may be recovered in due time.
Lldenaurois
commented
Jul 16, 2021
drahnr
reviewed
Jul 16, 2021
ordian
reviewed
Jul 16, 2021
drahnr
reviewed
Jul 16, 2021
ordian
reviewed
Jul 16, 2021
ordian
reviewed
Jul 16, 2021
ordian
reviewed
Jul 16, 2021
rphmeier
reviewed
Jul 17, 2021
rphmeier
reviewed
Jul 17, 2021
3f2ce2b to
c5c6bce
Compare
Lldenaurois
commented
Jul 18, 2021
c5c6bce to
f3c30fa
Compare
|
@rphmeier How do we keep track of when we've recovered all Statements for all leaves? In this current setting we simply always handle each leaf as it comes in. |
f3c30fa to
e37d6d7
Compare
Lldenaurois
commented
Jul 19, 2021
rphmeier
reviewed
Jul 19, 2021
rphmeier
reviewed
Jul 19, 2021
rphmeier
reviewed
Jul 19, 2021
rphmeier
reviewed
Jul 19, 2021
rphmeier
reviewed
Jul 19, 2021
Comment on lines
445
to
451
| let missing_local_statement = validators.iter() | ||
| .enumerate() | ||
| .map(|(index, validator)| (ValidatorIndex(index as _), validator)) | ||
| .filter(|(index, validator)| | ||
| voted_indices.contains(index) || | ||
| state.keystore.key_pair::<ValidatorPair>(validator).map(|v| v.is_none()).unwrap_or_default()) | ||
| .count() > 0; |
There was a problem hiding this comment.
Suggested change
| let missing_local_statement = validators.iter() | |
| .enumerate() | |
| .map(|(index, validator)| (ValidatorIndex(index as _), validator)) | |
| .filter(|(index, validator)| | |
| voted_indices.contains(index) || | |
| state.keystore.key_pair::<ValidatorPair>(validator).map(|v| v.is_none()).unwrap_or_default()) | |
| .count() > 0; | |
| let missing_local_statement = validators.iter() | |
| .enumerate() | |
| .map(|(index, validator)| (ValidatorIndex(index as _), validator)) | |
| .any(|(index, validator)| | |
| !voted_indices.contains(index) && | |
| state.keystore.key_pair::<ValidatorPair>(validator).ok().flatten().map_or(false, |v| v.is_some()) | |
| ); |
re: https://github.com/paritytech/polkadot/pull/3481/files#r672552299 and https://github.com/paritytech/polkadot/pull/3481/files#r672551425
There was a problem hiding this comment.
I don't see how this is correct. The iterator contains an entry for each validator which (has voted | has no key). We really want (has not voted & has a key).
map_or is more expressive than using unwrap_or_default implicitly evaluating to false as a default.
There was a problem hiding this comment.
I will write a test to ensure we can ensure this property.
rphmeier
suggested changes
Jul 19, 2021
rphmeier
approved these changes
Jul 19, 2021
|
bot rebase |
|
Rebasing. |
|
@Lldenaurois I triggered the rebase because I wanted to merge, but it seems like you wanted to have another test. Let's block until that's in and then merge |
handle local_statements that are not missing.
rphmeier
approved these changes
Jul 21, 2021
ordian
added a commit
that referenced
this pull request
Jul 23, 2021
* master: Reduce staking miner reward (companion `substrate/pull/9395`) (#3465) Parachains shared.rs to Frame V2 (#3425) Parachains hrmp.rs to Frame V2 (#3475) Migrate slots pallet to pallet attribute macro. (#3218) Improve test in bridge (#3507) parachain dmp.rs to Frame V2 (#3426) Parachains inclusion.rs to Frame V2 (#3440) Dispute coordinator - Recover disputes on startup (#3481) Use correct syntax for owning all files in a folder (#3510) Add wococo-local chain spec (#3509) Dispute vote filtering for block authors (#3498) Bump indexmap from 1.6.1 to 1.7.0 (#3497) Companion for substrate #9315 (#3477)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 PR modifies the dispute coordinator to send a
DisputeCoordinatorMessage::Participatefor each non-concluded dispute for which the subsystem has no local statement on restarts.Before entering the main event loop, the subsystem will attempt to resume operation by:
ChainSelection::Leavesrequest.handle_new_activationsfor the returned leaves.DisputeCoordinatorMessage::Participatefor any disputes that are missing a local statement.Along the way the test harness is also refactored to ergonomically support restarting the subsystem, while carrying over any database state between executions.
Fixes #3445