Skip to content

perf: Speed up storage_reservation_test #9514

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

Merged
alin-at-dfinity merged 2 commits into from
Mar 23, 2026
Merged

perf: Speed up storage_reservation_test #9514

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45ad21b
fix: Speed up `storage_reservation_test`
alin-at-dfinity Mar 20, 2026
640cb6d
Merge branch 'master' into alin/speed-up-storage_reservation_test
alin-at-dfinity Mar 20, 2026
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
26 changes: 20 additions & 6 deletions rs/execution_environment/tests/storage_reservation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ use ic_management_canister_types_private::CanisterSettingsArgsBuilder;
use ic_registry_subnet_type::SubnetType;
use ic_state_machine_tests::{StateMachine, StateMachineBuilder, StateMachineConfig, WasmResult};
use ic_test_utilities::universal_canister::{UNIVERSAL_CANISTER_WASM, wasm};
use ic_types::CanisterId;
use ic_types::{CanisterId, NumBytes};
use ic_types_cycles::Cycles;

const T: u128 = 1_000_000_000_000;
const GIB: u64 = 1_u64 << 30;

fn reserved_cycles_memory_grow_to_full_capacity<F>(
grow: F,
Expand All @@ -19,8 +20,17 @@ fn reserved_cycles_memory_grow_to_full_capacity<F>(
{
// Create application subnet `StateMachine`.
let subnet_type = SubnetType::Application;
let subnet_config = SubnetConfig::new(subnet_type);
let execution_config = ExecutionConfig::default();
let mut subnet_config = SubnetConfig::new(subnet_type);
// 2 cores, so we don't have to retry every allocation 4 times (due to the
// memory being split 4 ways).
subnet_config.scheduler_config.scheduler_cores = 2;
// Lower capacity and threshold, so the test does not take forever.
let execution_config = ExecutionConfig {
subnet_memory_capacity: NumBytes::new(4 * GIB),
subnet_memory_threshold: NumBytes::new(2 * GIB),
subnet_memory_reservation: NumBytes::new(0),
..ExecutionConfig::default()
};
let config = StateMachineConfig::new(subnet_config, execution_config);
let env = StateMachineBuilder::new()
.with_config(Some(config))
Expand Down Expand Up @@ -96,6 +106,10 @@ fn reserved_cycles_stable_memory_grow_to_full_capacity() {
.append_and_reply()
.build(),
);
// With multiple canisters, we may run out of memory after only a few of them.
if res.is_err() {
break;
}
// if `ic0.stable64_grow` returns -1 (i.e., fails)
if res
== Ok(WasmResult::Reply(vec![
Expand All @@ -114,8 +128,8 @@ fn reserved_cycles_stable_memory_grow_to_full_capacity() {
};

// The total amount of reserved cycles to claim the full subnet memory capacity.
const NUM_CANISTERS: usize = 5; // we need multiple canisters since the stable memory of a single canister cannot fill the subnet
const EXPECTED_RESERVED_CYCLES: u128 = 48_911 * T;
const NUM_CANISTERS: usize = 1;
const EXPECTED_RESERVED_CYCLES: u128 = 96 * T;
reserved_cycles_memory_grow_to_full_capacity(
stable_grow,
NUM_CANISTERS,
Expand Down Expand Up @@ -154,7 +168,7 @@ fn reserved_cycles_memory_allocation_grow_to_full_capacity() {
// The total amount of reserved cycles to claim the full subnet memory capacity
// while reserving a lot of memory at once.
const NUM_CANISTERS: usize = 1; // a single canister can fill the subnet with its memory allocation
const EXPECTED_RESERVED_CYCLES: u128 = 68_866 * T;
const EXPECTED_RESERVED_CYCLES: u128 = 136 * T;
reserved_cycles_memory_grow_to_full_capacity(
ic00_grow,
NUM_CANISTERS,
Expand Down
Loading