This repository was archived by the owner on Nov 15, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 2.7k
client/beefy: add some bounds on enqueued votes #12562
Merged
acatangiu
merged 20 commits into
paritytech:master
from
dharjeezy:dharjeezy/bounds-on-enqueued-votes
Dec 5, 2022
Merged
Changes from 17 commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
3f14844
use bounded btree map
dharjeezy 2fe81e3
include a type parameter for max pending votes
dharjeezy 7ee3cd8
introduce bounded btree map
dharjeezy 6580a04
fix warnings
dharjeezy 86c40c6
note
dharjeezy 29fef8f
switch to u64
dharjeezy 4b5b9d4
fixes and checks
dharjeezy 657ed78
cleanup
dharjeezy 9026803
requested changes
dharjeezy cc7183b
Merge remote-tracking branch 'origin/dharjeezy/bounds-on-enqueued-vot…
dharjeezy d99e308
use bounded vec
dharjeezy de28abb
make use of enqueued_vote helper function
dharjeezy 1564bbf
Merge branch 'master' of https://github.com/dharjeezy/substrate into …
dharjeezy d7f3053
merge changes
dharjeezy 8391fd9
implement deref mut for BoundedBTreeMap
dharjeezy b8fabca
use a BTreeMap and check for bounds
dharjeezy 5876600
cargo fmt
dharjeezy 6d525c1
use usize
dharjeezy caa385a
Merge remote-tracking branch 'origin/master' into dharjeezy/bounds-on…
596de97
Merge remote-tracking branch 'origin/master' into dharjeezy/bounds-on…
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -47,15 +47,22 @@ use sp_consensus::SyncOracle; | |
| use sp_mmr_primitives::MmrApi; | ||
| use sp_runtime::{ | ||
| generic::OpaqueDigestItemId, | ||
| traits::{Block, Header, NumberFor, Zero}, | ||
| SaturatedConversion, | ||
| traits::{Block, ConstU32, Header, NumberFor, Zero}, | ||
| BoundedVec, SaturatedConversion, | ||
| }; | ||
| use std::{ | ||
| collections::{BTreeMap, BTreeSet, VecDeque}, | ||
| fmt::Debug, | ||
| marker::PhantomData, | ||
| sync::Arc, | ||
| }; | ||
| /// Bound for the number of buffered future voting rounds. | ||
| const MAX_BUFFERED_VOTE_ROUNDS: u32 = 20; | ||
| /// Bound for the number of buffered votes per round number. | ||
| const MAX_BUFFERED_VOTES_PER_ROUND: u32 = 1000; | ||
| /// Bound for the number of pending justifications - use 2400 - the max number | ||
| /// of justifications possible in a single session. | ||
| const MAX_BUFFERED_JUSTIFICATIONS: u32 = 2400; | ||
|
|
||
| pub(crate) enum RoundAction { | ||
| Drop, | ||
|
|
@@ -307,7 +314,13 @@ pub(crate) struct BeefyWorker<B: Block, BE, P, R, N> { | |
| /// BEEFY client metrics. | ||
| metrics: Option<Metrics>, | ||
| /// Buffer holding votes for future processing. | ||
| pending_votes: BTreeMap<NumberFor<B>, Vec<VoteMessage<NumberFor<B>, AuthorityId, Signature>>>, | ||
| pending_votes: BTreeMap< | ||
| NumberFor<B>, | ||
| BoundedVec< | ||
| VoteMessage<NumberFor<B>, AuthorityId, Signature>, | ||
| ConstU32<MAX_BUFFERED_VOTES_PER_ROUND>, | ||
| >, | ||
| >, | ||
| /// Buffer holding justifications for future processing. | ||
| pending_justifications: BTreeMap<NumberFor<B>, BeefyVersionedFinalityProof<B>>, | ||
| /// Persisted voter state. | ||
|
|
@@ -482,7 +495,14 @@ where | |
| )?, | ||
| RoundAction::Enqueue => { | ||
| debug!(target: "beefy", "🥩 Buffer vote for round: {:?}.", block_num); | ||
| self.pending_votes.entry(block_num).or_default().push(vote) | ||
| if self.pending_votes.len() < MAX_BUFFERED_VOTE_ROUNDS as usize { | ||
acatangiu marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| let votes_vec = self.pending_votes.entry(block_num).or_default(); | ||
| if votes_vec.try_push(vote).is_err() { | ||
| warn!(target: "beefy", "🥩 Buffer vote dropped for round: {:?}", block_num) | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Just random thought: value in
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. yes, that's correct - added explicit comment for this to #12692 |
||
| } | ||
| } else { | ||
| error!(target: "beefy", "🥩 Buffer justification dropped for round: {:?}.", block_num); | ||
| } | ||
| }, | ||
| RoundAction::Drop => (), | ||
| }; | ||
|
|
@@ -508,7 +528,11 @@ where | |
| }, | ||
| RoundAction::Enqueue => { | ||
| debug!(target: "beefy", "🥩 Buffer justification for round: {:?}.", block_num); | ||
| self.pending_justifications.entry(block_num).or_insert(justification); | ||
| if self.pending_justifications.len() < MAX_BUFFERED_JUSTIFICATIONS as usize { | ||
| self.pending_justifications.entry(block_num).or_insert(justification); | ||
| } else { | ||
| error!(target: "beefy", "🥩 Buffer justification dropped for round: {:?}.", block_num); | ||
| } | ||
| }, | ||
| RoundAction::Drop => (), | ||
| }; | ||
|
|
||
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.
Uh oh!
There was an error while loading. Please reload this page.