-
Notifications
You must be signed in to change notification settings - Fork 700
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Collation fetching fairness #4880
base: master
Are you sure you want to change the base?
Conversation
polkadot/node/network/collator-protocol/src/validator_side/collation.rs
Outdated
Show resolved
Hide resolved
polkadot/node/network/collator-protocol/src/validator_side/collation.rs
Outdated
Show resolved
Hide resolved
c7f24aa
to
0f28aa8
Compare
polkadot/node/network/collator-protocol/src/validator_side/collation.rs
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good overall! I'll approve once the comments and what we discussed in private is fixed
Thanks for the detailed PR description!
polkadot/node/network/collator-protocol/src/validator_side/mod.rs
Outdated
Show resolved
Hide resolved
@@ -398,7 +369,7 @@ struct State { | |||
/// support prospective parachains. This mapping works as a replacement for | |||
/// [`polkadot_node_network_protocol::View`] and can be dropped once the transition | |||
/// to asynchronous backing is done. | |||
active_leaves: HashMap<Hash, ProspectiveParachainsMode>, | |||
active_leaves: HashMap<Hash, AsyncBackingParams>, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
as discussed, this will be worked on later. let's open an issue for it
polkadot/node/network/collator-protocol/src/validator_side/collation.rs
Outdated
Show resolved
Hide resolved
polkadot/node/network/collator-protocol/src/validator_side/mod.rs
Outdated
Show resolved
Hide resolved
polkadot/node/network/collator-protocol/src/validator_side/tests/prospective_parachains.rs
Outdated
Show resolved
Hide resolved
polkadot/node/network/collator-protocol/src/validator_side/tests/prospective_parachains.rs
Outdated
Show resolved
Hide resolved
…lator disrespecting the claim queue limits
Co-authored-by: Alin Dima <[email protected]>
…_and_pending_for_para_above` + comments
polkadot/node/network/collator-protocol/src/validator_side/tests/mod.rs
Outdated
Show resolved
Hide resolved
polkadot/zombienet_tests/functional/0018-shared-core-idle-parachain.toml
Show resolved
Hide resolved
polkadot/zombienet_tests/functional/0019-coretime-collation-fetching-fairness.toml
Outdated
Show resolved
Hide resolved
All GitHub workflows were cancelled due to failure one of the required jobs. |
bot fmt |
@tdimitrov https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/7775406 was started for your command Comment |
@tdimitrov Command |
let scheduled_paras = relay_parent_state.assignment.current.iter().collect::<HashSet<_>>(); | ||
let mut claims_per_para = HashMap::new(); | ||
for para_id in scheduled_paras { | ||
let below = seconded_and_pending_for_para_below( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
as discussed offline, we should be using the same claimed_within_view
function here
// - at RP 3 we reach our target relay parent with ACC = 1. We want to advertise at RP 3 so we | ||
// add 1 to ACC and it becomes 2. IMPORTANT: since RP3 is our target relay parent we DON'T | ||
// subtract 1 since this is the position the new advertisement will occupy. | ||
// - ACC = 2 is the final result which represents the number of claims for para A at RP3. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
as discussed, the comment needs updating
…nding_for_para_above`
Related to #1797
The problem
When fetching collations in collator protocol/validator side we need to ensure that each parachain has got a fair core time share depending on its assignments in the claim queue. This means that the number of collations fetched per parachain should ideally be equal to (but definitely not bigger than) the number of claims for the particular parachain in the claim queue.
Why the current implementation is not good enough
The current implementation doesn't guarantee such fairness. For each relay parent there is a
waiting_queue
(PerRelayParent -> Collations -> waiting_queue) which holds any unfetched collations advertised to the validator. The collations are fetched on first in first out principle which means that if two parachains share a core and one of the parachains is more aggressive it might starve the second parachain. How? At each relay parent up tomax_candidate_depth
candidates are accepted (enforced infn is_seconded_limit_reached
) so if one of the parachains is quick enough to fill in the queue with its advertisements the validator will never fetch anything from the rest of the parachains despite they are scheduled. This doesn't mean that the aggressive parachain will occupy all the core time (this is guaranteed by the runtime) but it will deny the rest of the parachains sharing the same core to have collations backed.How to fix it
The solution I am proposing is to limit fetches and advertisements based on the state of the claim queue. At each relay parent the claim queue for the core assigned to the validator is fetched. For each parachain a fetch limit is calculated (equal to the number of entries in the claim queue). Advertisements are not fetched for a parachain which has exceeded its claims in the claim queue. This solves the problem with aggressive parachains advertising too much collations.
The second part is in collation fetching logic. The collator will keep track on which collations it has fetched so far. When a new collation needs to be fetched instead of popping the first entry from the
waiting_queue
the validator examines the claim queue and looks for the earliest claim which hasn't got a corresponding fetch. This way the collator will always try to prioritise the most urgent entries.How the 'fair share of coretime' for each parachain is determined?
Thanks to async backing we can accept more than one candidate per relay parent (with some constraints). We also have got the claim queue which gives us a hint which parachain will be scheduled next on each core. So thanks to the claim queue we can determine the maximum number of claims per parachain.
For example the claim queue is [A A A] at relay parent X so we know that at relay parent X we can accept three candidates for parachain A. There are two things to consider though:
There are a few cases worth considering:
CQ @ rp X: [A A A]
Advertisements at X-1 for para A: 2
Advertisements at X-2 for para A: 2
Outcome - at rp X we can accept only 1 advertisement since our slots were already claimed.
CQ @ rp X: [A A A]
Advertisements at X+1 for para A: 1
Advertisements at X+2 for para A: 1
Outcome: at rp X we can accept only 1 advertisement since the slots in our relay parents were already claimed.
The situation becomes more complicated with multiple leaves (forks). Imagine we have got a fork at rp X:
Now when we examine the claim queue at RP X we need to consider both forks. This means that accepting a candidate at X means that we should have a slot for it in BOTH leaves. If for example there are three candidates accepted at rp X+1' we can't accept any candidates at rp X because there will be no slot for it in one of the leaves.
How the claims are counted
There are two solutions for counting the claims at relay parent X:
Solution 1 is hard to implement with forks. There are too many variants to keep track of (different state for each leaf) and at the same time we might never need to use them. So I decided to go with option 2 - building claim queue state on the fly.
To achieve this I've extended
View
from backing_implicit_view to keep track of the outer leaves. I've also added a method which accepts a relay parent and return all paths from an outer leaf to it. Let's call itpaths_to_relay_parent
.So how the counting works for relay parent X? First we examine the number of seconded and pending advertisements (more on pending in a second) from relay parent X to relay parent X-N (inclusive) where N is the length of the claim queue. Then we use
paths_to_relay_parent
to obtain all paths from outer leaves to relay parent X. We calculate the claims at relay parents X+1 to X+N (inclusive) for each leaf and get the maximum value. This way we guarantee that the candidate at rp X can be included in each leaf. This is the state of the claim queue which we use to decide if we can fetch one more advertisement at rp X or not.What is a pending advertisement
I mentioned that we count seconded and pending advertisements at relay parent X. A pending advertisement is:
Any of these is considered a 'pending fetch' and a slot for it is kept. All of them are already tracked in
State
.