-
Notifications
You must be signed in to change notification settings - Fork 710
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
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
734c63d
Fix scheduled state at session boundaries.
fe23e08
Cleanup + better docs.
cef6b43
More cleanup and fixes.
187a785
Remove 12s hack.
ee9023f
Merge branch 'master' into rk-para-session-fix
3d4ac67
Add dep.
09acc48
Make clippy happy
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 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 |
---|---|---|
|
@@ -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| { | ||
let time_out_at = backed_in_number + availability_period; | ||
|
||
|
@@ -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. | ||
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. No longer true. Only worked with the |
||
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, | ||
}); | ||
} | ||
|
Oops, something went wrong.
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.
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.
Don't duplicate time out logic, but use same function as the scheduler uses to avoid this to diverge from reality.