Skip to content
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

Fix nothing scheduled on session boundary #1403

Merged
merged 7 commits into from
Sep 6, 2023
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions polkadot/runtime/parachains/src/runtime_api_impl/v5.rs
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@ pub fn availability_cores<T: initializer::Config>() -> Vec<CoreState<T::Hash, Bl
let now = <frame_system::Pallet<T>>::block_number() + One::one();
let rotation_info = <scheduler::Pallet<T>>::group_rotation_info(now);

// This explicit update is only strictly required for session boundaries:
//
// At the end of a session we clear the claim queues: Without this update call, nothing would be
// scheduled to the client.
let scheduled = <scheduler::Pallet<T>>::update_claimqueue(Vec::new(), now);

let time_out_at = |backed_in_number, availability_period| {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't duplicate time out logic, but use same function as the scheduler uses to avoid this to diverge from reality.

let time_out_at = backed_in_number + availability_period;

Expand Down Expand Up @@ -126,9 +132,9 @@ pub fn availability_cores<T: initializer::Config>() -> Vec<CoreState<T::Hash, Bl
.collect();

// This will overwrite only `Free` cores if the scheduler module is working as intended.
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No longer true. Only worked with the None hack.

for scheduled in <scheduler::Pallet<T>>::scheduled_claimqueue() {
core_states[scheduled.core.0 as usize] = CoreState::Scheduled(primitives::ScheduledCore {
para_id: scheduled.paras_entry.para_id(),
for s in scheduled {
eskimor marked this conversation as resolved.
Show resolved Hide resolved
core_states[s.core.0 as usize] = CoreState::Scheduled(primitives::ScheduledCore {
para_id: s.paras_entry.para_id(),
collator: None,
});
}
Expand Down