Skip to content

[DNM] Restrict usable cores to 1 #9978

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.

Sign up for GitHub

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

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
+10 −9
Open

[DNM] Restrict usable cores to 1 #9978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bb9573b
hack
sandreim Oct 9, 2025
b59431a
please compile
sandreim Oct 9, 2025
1a5c511
come on
sandreim Oct 9, 2025
e93f155
make tests pass
sandreim Oct 9, 2025
b323125
Merge branch 'master' into sandreim/temp_hack_for_yap_canary
sandreim Oct 9, 2025
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
11 changes: 6 additions & 5 deletions cumulus/client/consensus/aura/src/collators/slot_based/block_builder_task.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,8 @@ where
continue;
};

slot_timer.update_scheduling(core.total_cores().into());
// Temp hack to ensure we use only 1 core per RCB.
slot_timer.update_scheduling(1);

// We mainly call this to inform users at genesis if there is a mismatch with the
// on-chain data.
Expand Down Expand Up @@ -541,10 +542,10 @@ impl Core {
self.core_index
}

/// Returns the total number of cores.
pub(crate) fn total_cores(&self) -> u16 {
self.number_of_cores
}
// Returns the total number of cores.
// pub(crate) fn total_cores(&self) -> u16 {
// self.number_of_cores
// }
}

/// Determine the core for the given `para_id`.
Expand Down
8 changes: 4 additions & 4 deletions cumulus/client/consensus/aura/src/collators/slot_based/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ async fn determine_core_new_relay_parent() {
let core = core.unwrap();
assert_eq!(core.core_selector(), CoreSelector(0));
assert_eq!(core.core_index(), CoreIndex(0));
assert_eq!(core.total_cores(), 2);
// assert_eq!(core.total_cores(), 2);
}

#[tokio::test]
Expand Down Expand Up @@ -180,7 +180,7 @@ async fn determine_core_with_core_info() {
Ok(Some(core)) => {
assert_eq!(core.core_selector(), CoreSelector(1)); // Should be next selector (0 + 1)
assert_eq!(core.core_index(), CoreIndex(1));
assert_eq!(core.total_cores(), 3);
// assert_eq!(core.total_cores(), 3);
},
Ok(None) => panic!("Expected Some core, got None"),
Err(()) => panic!("determine_core returned error"),
Expand Down Expand Up @@ -304,7 +304,7 @@ async fn determine_core_uses_last_claimed_core_selector() {
// Should use last_claimed_core_selector (1) + 1 = 2
assert_eq!(core.core_selector(), CoreSelector(2));
assert_eq!(core.core_index(), CoreIndex(2));
assert_eq!(core.total_cores(), 3);
// assert_eq!(core.total_cores(), 3);
},
Ok(None) => panic!("Expected Some core, got None"),
Err(()) => panic!("determine_core returned error"),
Expand Down Expand Up @@ -406,7 +406,7 @@ async fn determine_core_no_last_claimed_core_selector() {
// Should start from selector 0 + 1 = 1 when no last selector
assert_eq!(core.core_selector(), CoreSelector(1));
assert_eq!(core.core_index(), CoreIndex(1));
assert_eq!(core.total_cores(), 3);
// assert_eq!(core.total_cores(), 3);
},
Ok(None) => panic!("Expected Some core, got None"),
Err(()) => panic!("determine_core returned error"),
Expand Down
Loading