feat: Bump the state size limit to 1 TiB and stable memory limit to 5…

…00 GiB (#2465)
dfinity · Nov 6, 2024 · 41af49d · 41af49d
1 parent 43739c1
commit 41af49d
Show file tree

Hide file tree

Showing 20 changed files with 41 additions and 40 deletions.
diff --git a/rs/config/src/execution_environment.rs b/rs/config/src/execution_environment.rs
@@ -9,6 +9,7 @@ use std::{str::FromStr, time::Duration};
 
 const MIB: u64 = 1024 * 1024;
 const GIB: u64 = MIB * 1024;
+const TIB: u64 = GIB * 1024;
 
 /// This specifies the threshold in bytes at which the subnet memory usage is
 /// considered to be high. If this value is greater or equal to the subnet
@@ -21,7 +22,7 @@ const SUBNET_MEMORY_THRESHOLD: NumBytes = NumBytes::new(450 * GIB);
 /// Logical storage is the amount of storage being used from the point of view
 /// of the canister. The actual storage used by the nodes can be higher as the
 /// IC protocol requires storing copies of the canister state.
-const SUBNET_MEMORY_CAPACITY: NumBytes = NumBytes::new(700 * GIB);
+const SUBNET_MEMORY_CAPACITY: NumBytes = NumBytes::new(TIB);
 
 /// This is the upper limit on how much memory can be used by all guaranteed
 /// response canister messages on a given subnet.

diff --git a/rs/embedders/tests/snapshots/instrumentation__app.snap b/rs/embedders/tests/snapshots/instrumentation__app.snap
@@ -195,8 +195,8 @@ expression: out
     i32.sub
   )
   (memory (;0;) 17)
-  (memory (;1;) i64 0 6553600)
-  (memory (;2;) 1600 1600)
+  (memory (;1;) i64 0 8192000)
+  (memory (;2;) 2000 2000)
   (global (;0;) (mut i64) i64.const 0)
   (global (;1;) (mut i64) i64.const 0)
   (global (;2;) (mut i64) i64.const 0)

diff --git a/rs/embedders/tests/snapshots/instrumentation__app2.snap b/rs/embedders/tests/snapshots/instrumentation__app2.snap
@@ -202,8 +202,8 @@ expression: out
     local.get 5
     i32.sub
   )
-  (memory (;0;) i64 0 6553600)
-  (memory (;1;) 1600 1600)
+  (memory (;0;) i64 0 8192000)
+  (memory (;1;) 2000 2000)
   (global (;0;) (mut i64) i64.const 0)
   (global (;1;) (mut i64) i64.const 0)
   (global (;2;) (mut i64) i64.const 0)

diff --git a/rs/embedders/tests/snapshots/instrumentation__basic.snap b/rs/embedders/tests/snapshots/instrumentation__basic.snap
@@ -101,8 +101,8 @@ expression: out
     local.get 5
     i32.sub
   )
-  (memory (;0;) i64 0 6553600)
-  (memory (;1;) 1600 1600)
+  (memory (;0;) i64 0 8192000)
+  (memory (;1;) 2000 2000)
   (global (;0;) (mut i64) i64.const 0)
   (global (;1;) (mut i64) i64.const 0)
   (global (;2;) (mut i64) i64.const 0)

diff --git a/rs/embedders/tests/snapshots/instrumentation__basic_import.snap b/rs/embedders/tests/snapshots/instrumentation__basic_import.snap
@@ -103,8 +103,8 @@ expression: out
     local.get 5
     i32.sub
   )
-  (memory (;0;) i64 0 6553600)
-  (memory (;1;) 1600 1600)
+  (memory (;0;) i64 0 8192000)
+  (memory (;1;) 2000 2000)
   (global (;0;) (mut i64) i64.const 0)
   (global (;1;) (mut i64) i64.const 0)
   (global (;2;) (mut i64) i64.const 0)

diff --git a/rs/embedders/tests/snapshots/instrumentation__basic_import_call.snap b/rs/embedders/tests/snapshots/instrumentation__basic_import_call.snap
@@ -105,8 +105,8 @@ expression: out
     local.get 5
     i32.sub
   )
-  (memory (;0;) i64 0 6553600)
-  (memory (;1;) 1600 1600)
+  (memory (;0;) i64 0 8192000)
+  (memory (;1;) 2000 2000)
   (global (;0;) (mut i64) i64.const 0)
   (global (;1;) (mut i64) i64.const 0)
   (global (;2;) (mut i64) i64.const 0)

diff --git a/rs/embedders/tests/snapshots/instrumentation__control_flow.snap b/rs/embedders/tests/snapshots/instrumentation__control_flow.snap
@@ -200,8 +200,8 @@ expression: out
     i32.sub
   )
   (memory (;0;) 1)
-  (memory (;1;) i64 0 6553600)
-  (memory (;2;) 1600 1600)
+  (memory (;1;) i64 0 8192000)
+  (memory (;2;) 2000 2000)
   (global (;0;) (mut i64) i64.const 0)
   (global (;1;) (mut i64) i64.const 0)
   (global (;2;) (mut i64) i64.const 0)

diff --git a/rs/embedders/tests/snapshots/instrumentation__element.snap b/rs/embedders/tests/snapshots/instrumentation__element.snap
@@ -131,8 +131,8 @@ expression: out
     i32.sub
   )
   (table (;0;) 5 5 funcref)
-  (memory (;0;) i64 0 6553600)
-  (memory (;1;) 1600 1600)
+  (memory (;0;) i64 0 8192000)
+  (memory (;1;) 2000 2000)
   (global (;0;) (mut i64) i64.const 0)
   (global (;1;) (mut i64) i64.const 0)
   (global (;2;) (mut i64) i64.const 0)

diff --git a/rs/embedders/tests/snapshots/instrumentation__export_mutable_globals.snap b/rs/embedders/tests/snapshots/instrumentation__export_mutable_globals.snap
@@ -86,8 +86,8 @@ expression: out
     local.get 5
     i32.sub
   )
-  (memory (;0;) i64 0 6553600)
-  (memory (;1;) 1600 1600)
+  (memory (;0;) i64 0 8192000)
+  (memory (;1;) 2000 2000)
   (global (;0;) (mut i32) i32.const 0)
   (global (;1;) i32 i32.const 1)
   (global (;2;) i32 i32.const 2)

diff --git a/rs/embedders/tests/snapshots/instrumentation__fac.snap b/rs/embedders/tests/snapshots/instrumentation__fac.snap
@@ -119,8 +119,8 @@ expression: out
     local.get 5
     i32.sub
   )
-  (memory (;0;) i64 0 6553600)
-  (memory (;1;) 1600 1600)
+  (memory (;0;) i64 0 8192000)
+  (memory (;1;) 2000 2000)
   (global (;0;) (mut i64) i64.const 0)
   (global (;1;) (mut i64) i64.const 0)
   (global (;2;) (mut i64) i64.const 0)

diff --git a/rs/embedders/tests/snapshots/instrumentation__fizzbuzz.snap b/rs/embedders/tests/snapshots/instrumentation__fizzbuzz.snap
@@ -226,8 +226,8 @@ expression: out
     i32.sub
   )
   (memory (;0;) 1)
-  (memory (;1;) i64 0 6553600)
-  (memory (;2;) 1600 1600)
+  (memory (;1;) i64 0 8192000)
+  (memory (;2;) 2000 2000)
   (global (;0;) (mut i64) i64.const 0)
   (global (;1;) (mut i64) i64.const 0)
   (global (;2;) (mut i64) i64.const 0)

diff --git a/rs/embedders/tests/snapshots/instrumentation__memory_fill.snap b/rs/embedders/tests/snapshots/instrumentation__memory_fill.snap
@@ -106,8 +106,8 @@ expression: out
     i32.sub
   )
   (memory (;0;) 1)
-  (memory (;1;) i64 0 6553600)
-  (memory (;2;) 1600 1600)
+  (memory (;1;) i64 0 8192000)
+  (memory (;2;) 2000 2000)
   (global (;0;) (mut i64) i64.const 0)
   (global (;1;) (mut i64) i64.const 0)
   (global (;2;) (mut i64) i64.const 0)

diff --git a/rs/embedders/tests/snapshots/instrumentation__memory_grow.snap b/rs/embedders/tests/snapshots/instrumentation__memory_grow.snap
@@ -106,8 +106,8 @@ expression: out
     i32.sub
   )
   (memory (;0;) 17 100)
-  (memory (;1;) i64 0 6553600)
-  (memory (;2;) 1600 1600)
+  (memory (;1;) i64 0 8192000)
+  (memory (;2;) 2000 2000)
   (global (;0;) (mut i64) i64.const 0)
   (global (;1;) (mut i64) i64.const 0)
   (global (;2;) (mut i64) i64.const 0)

diff --git a/rs/embedders/tests/snapshots/instrumentation__nested_ifs.snap b/rs/embedders/tests/snapshots/instrumentation__nested_ifs.snap
@@ -174,8 +174,8 @@ expression: out
     local.get 5
     i32.sub
   )
-  (memory (;0;) i64 0 6553600)
-  (memory (;1;) 1600 1600)
+  (memory (;0;) i64 0 8192000)
+  (memory (;1;) 2000 2000)
   (global (;0;) (mut i64) i64.const 0)
   (global (;1;) (mut i64) i64.const 0)
   (global (;2;) (mut i64) i64.const 0)

diff --git a/rs/embedders/tests/snapshots/instrumentation__recursive.snap b/rs/embedders/tests/snapshots/instrumentation__recursive.snap
@@ -123,8 +123,8 @@ expression: out
     local.get 5
     i32.sub
   )
-  (memory (;0;) i64 0 6553600)
-  (memory (;1;) 1600 1600)
+  (memory (;0;) i64 0 8192000)
+  (memory (;1;) 2000 2000)
   (global (;0;) (mut i64) i64.const 0)
   (global (;1;) (mut i64) i64.const 0)
   (global (;2;) (mut i64) i64.const 0)

diff --git a/rs/embedders/tests/snapshots/instrumentation__simple_loop.snap b/rs/embedders/tests/snapshots/instrumentation__simple_loop.snap
@@ -112,8 +112,8 @@ expression: out
     i32.sub
   )
   (memory $memory (;0;) 1)
-  (memory (;1;) i64 0 6553600)
-  (memory (;2;) 1600 1600)
+  (memory (;1;) i64 0 8192000)
+  (memory (;2;) 2000 2000)
   (global (;0;) (mut i64) i64.const 0)
   (global (;1;) (mut i64) i64.const 0)
   (global (;2;) (mut i64) i64.const 0)

diff --git a/rs/embedders/tests/snapshots/instrumentation__start.snap b/rs/embedders/tests/snapshots/instrumentation__start.snap
@@ -117,8 +117,8 @@ expression: out
   )
   (table (;0;) 0 1 funcref)
   (memory (;0;) 1 1)
-  (memory (;1;) i64 0 6553600)
-  (memory (;2;) 1600 1600)
+  (memory (;1;) i64 0 8192000)
+  (memory (;2;) 2000 2000)
   (global (;0;) (mut i64) i64.const 0)
   (global (;1;) (mut i64) i64.const 0)
   (global (;2;) (mut i64) i64.const 0)

diff --git a/rs/embedders/tests/snapshots/instrumentation__zero_cost_ops.snap b/rs/embedders/tests/snapshots/instrumentation__zero_cost_ops.snap
@@ -119,8 +119,8 @@ expression: out
     local.get 5
     i32.sub
   )
-  (memory (;0;) i64 0 6553600)
-  (memory (;1;) 1600 1600)
+  (memory (;0;) i64 0 8192000)
+  (memory (;1;) 2000 2000)
   (global (;0;) (mut i64) i64.const 0)
   (global (;1;) (mut i64) i64.const 0)
   (global (;2;) (mut i64) i64.const 0)

diff --git a/rs/rust_canisters/canister_creator/test/test.rs b/rs/rust_canisters/canister_creator/test/test.rs
@@ -102,10 +102,10 @@ fn install_code_works() {
     assert_eq!(result, WasmResult::Reply("null".as_bytes().to_vec()));
 
     // Assert there are 1_001 canisters running with the memory usage below the
-    // subnet storage capacity, which is currently 700 GiB.
+    // subnet storage capacity, which is currently 1 TiB
     assert_eq!(env.num_running_canisters(), 1_001);
     assert!(
-        env.canister_memory_usage_bytes() < 700 * 1024 * 1024 * 1024,
+        env.canister_memory_usage_bytes() < 1024 * 1024 * 1024 * 1024,
         "Actual: {} bytes",
         env.canister_memory_usage_bytes()
     );

diff --git a/rs/types/types/src/lib.rs b/rs/types/types/src/lib.rs
@@ -477,17 +477,17 @@ pub struct InvalidMemoryAllocationError {
     pub given: candid::Nat,
 }
 
-const GB: u64 = 1024 * 1024 * 1024;
+const GIB: u64 = 1024 * 1024 * 1024;
 
 /// The upper limit on the stable memory size.
 /// This constant is used by other crates to define other constants, that's why
 /// it is public and `u64` (`NumBytes` cannot be used in const expressions).
-pub const MAX_STABLE_MEMORY_IN_BYTES: u64 = 400 * GB;
+pub const MAX_STABLE_MEMORY_IN_BYTES: u64 = 500 * GIB;
 
 /// The upper limit on the Wasm memory size.
 /// This constant is used by other crates to define other constants, that's why
 /// it is public and `u64` (`NumBytes` cannot be used in const expressions).
-pub const MAX_WASM_MEMORY_IN_BYTES: u64 = 4 * GB;
+pub const MAX_WASM_MEMORY_IN_BYTES: u64 = 4 * GIB;
 
 const MIN_MEMORY_ALLOCATION: NumBytes = NumBytes::new(0);
 pub const MAX_MEMORY_ALLOCATION: NumBytes =