Consistent logic to select range sync start_slot #8416
+160
−111
Conversation
This file contains hidden or 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
|
|
||
| pub enum PeerSyncTypeAdvanced { | ||
| Finalized { | ||
| target_slot: Slot, |
| Finalized { | ||
| target_slot: Slot, | ||
| target_root: Hash256, | ||
| start_epoch: Epoch, |
| } | ||
|
|
||
| #[derive(Clone)] | ||
| pub(crate) struct LocalSyncInfo { |
| let status = chain.status_message(); | ||
| // Max with the store in case the node has triggered manual finalization | ||
| let local_irreversible_epoch = std::cmp::max( | ||
| chain.head().finalized_checkpoint().epoch, |
Member
There was a problem hiding this comment.
May as well use status.finalized_epoch() here to avoid potential inconsistencies. It's also likely to be marginally quicker
| PeerSyncType::FullySynced | ||
| } else { | ||
| PeerSyncType::Advanced | ||
| let finality_advanced = remote.finalized_epoch > local.finalized_epoch + 1; |
Member
There was a problem hiding this comment.
A comment or a const for this + 1 would be good I think
michaelsproul
added
waiting-on-author
Member
|
Changing this to waiting-on-author, I think you said last week you were planning to make some more changes |
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.
Issue Addressed
From #8382 I noted that the logic in range sync to decide where to start syncing from is scattered. When manual finalization is triggered, sync will fetch useless epochs.
Proposed Changes
This is a somewhat sensitive change that I don't want to have buried in #8382. Since manual finalization is an avaialble feature in current stable I think it's okay to fix separately to #8382.
This PR merges the logic to decide if a peer:
In a single function. Plus, the variant
PeerSyncType::Advancedincludes which slot sync should start from.