test(consensus): run consensus performance test with both 4MB and 8MB ingress payload limit

rs/tests/consensus/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@rules_rust//rust:defs.bzl", "rust_library")
+load("@rules_rust//rust:defs.bzl", "rust_binary", "rust_library")
 load("//rs/tests:common.bzl", "CANISTER_SANDBOX_RUNTIME_DEPS", "COUNTER_CANISTER_RUNTIME_DEPS", "IMPERSONATE_UPSTREAMS_RUNTIME_DEPS", "MESSAGE_CANISTER_RUNTIME_DEPS", "UNIVERSAL_CANISTER_RUNTIME_DEPS")
 load("//rs/tests:system_tests.bzl", "system_test", "system_test_nns")
 
@@ -323,8 +323,26 @@ system_test(
     ],
 )
 
+rust_binary(
+    name = "consensus_performance_bin",
+    testonly = True,
+    srcs = ["consensus_performance.rs"],
+    deps = [
+        # Keep sorted.
+        "//rs/registry/subnet_type",
+        "//rs/tests/consensus/utils",
+        "//rs/tests/driver:ic-system-test-driver",
+        "//rs/types/types",
+        "@crate_index//:anyhow",
+        "@crate_index//:reqwest",
+        "@crate_index//:serde_json",
+        "@crate_index//:slog",
+        "@crate_index//:tokio",
+    ],
+)
+
 system_test_nns(
-    name = "consensus_performance",
+    name = "consensus_performance_4MB",
     additional_colocate_tags = [
         "system_test_benchmark",
     ],
@@ -340,28 +358,53 @@ system_test_nns(
     }),
     enable_head_nns_variant = False,
     enable_metrics = True,
+    env = {
+        "MAX_INGRESS_BYTES_PER_BLOCK": "4194304",
+    },
     prometheus_vm_required_host_features = ["performance"],
     tags = [
         "colocate",
         "manual",
     ],
+    test_driver_target = ":consensus_performance_bin",
     test_timeout = "eternal",
     runtime_deps = COUNTER_CANISTER_RUNTIME_DEPS | {
         "IC_VERSION_FILE": "//bazel:version.txt",
         "JAEGER_UVM_CONFIG_IMAGE_ZST": "//rs/tests:jaeger_uvm_config_image",
     },
-    deps = [
-        # Keep sorted.
-        "//rs/registry/subnet_type",
-        "//rs/tests/consensus/utils",
-        "//rs/tests/driver:ic-system-test-driver",
-        "//rs/types/types",
-        "@crate_index//:anyhow",
-        "@crate_index//:reqwest",
-        "@crate_index//:serde_json",
-        "@crate_index//:slog",
-        "@crate_index//:tokio",
+)
+
+system_test_nns(
+    name = "consensus_performance_8MB",
+    additional_colocate_tags = [
+        "system_test_benchmark",
     ],
+    colocated_test_driver_vm_required_host_features = ["performance"],
+    colocated_test_driver_vm_resources = {
+        "vcpus": 64,
+        "memory_kibibytes": 512142680,
+        "boot_image_minimal_size_gibibytes": 500,
+    },
+    crate_features = select({
+        "//bazel:upload_perf_systest_results_enabled": ["upload_perf_systest_results"],
+        "//conditions:default": [],
+    }),
+    enable_head_nns_variant = False,
+    enable_metrics = True,
+    env = {
+        "MAX_INGRESS_BYTES_PER_BLOCK": "8388608",
+    },
+    prometheus_vm_required_host_features = ["performance"],
+    tags = [
+        "colocate",
+        "manual",
+    ],
+    test_driver_target = ":consensus_performance_bin",
+    test_timeout = "eternal",
+    runtime_deps = COUNTER_CANISTER_RUNTIME_DEPS | {
+        "IC_VERSION_FILE": "//bazel:version.txt",
+        "JAEGER_UVM_CONFIG_IMAGE_ZST": "//rs/tests:jaeger_uvm_config_image",
+    },
 )
 
 system_test_nns(

rs/tests/consensus/consensus_performance.rs

@@ -109,6 +109,11 @@ fn setup(env: TestEnv) {
         ));
     }
 
+    let max_ingress_bytes: u64 = std::env::var("MAX_INGRESS_BYTES_PER_BLOCK")
+        .expect("`MAX_INGRESS_BYTES_PER_BLOCK` env variable must be set")
+        .parse()
+        .unwrap();
+
     ic_builder
         .with_required_host_features(vec![HostFeature::Performance])
         .add_subnet(
@@ -128,6 +133,7 @@ fn setup(env: TestEnv) {
                     boot_image_minimal_size_gibibytes: Some(ImageSizeGiB::new(500)),
                 })
                 .with_dkg_interval_length(Height::from(DKG_INTERVAL))
+                .with_max_ingress_bytes_per_block(max_ingress_bytes)
                 .add_nodes(NODES_COUNT),
         )
         .setup_and_start(&env)
@@ -143,7 +149,13 @@ fn setup(env: TestEnv) {
     app_subnet.apply_network_settings(NETWORK_SIMULATION);
 }
 
-fn test(env: TestEnv, message_size: usize, rps: f64) {
+#[derive(Debug)]
+struct TestParameters {
+    message_size: usize,
+    rps: f64,
+}
+
+fn test(env: TestEnv, TestParameters { message_size, rps }: TestParameters) {
     let logger = env.logger();
 
     // create the runtime that lives until this variable is dropped.
@@ -179,27 +191,17 @@ fn test(env: TestEnv, message_size: usize, rps: f64) {
             LATENCY,
             BANDWIDTH_MBITS * 1_000_000,
             NODES_COUNT,
+            Some(
+                std::env::var("MAX_INGRESS_BYTES_PER_BLOCK")
+                    .expect("If we are here then we know the variable has been set")
+                    .parse()
+                    .expect("If we are here then we know the content is parsable"),
+            ),
             &logger,
         ));
     }
 }
 
-fn test_few_small_messages(env: TestEnv) {
-    test(env, 1, 1.0)
-}
-
-fn test_small_messages(env: TestEnv) {
-    test(env, 4_000, 500.0)
-}
-
-fn test_few_large_messages(env: TestEnv) {
-    test(env, 1_999_000, 1.0)
-}
-
-fn test_large_messages(env: TestEnv) {
-    test(env, 950_000, 4.0)
-}
-
 fn teardown(env: TestEnv) {
     let should_download_prometheus_data =
         std::env::var("DOWNLOAD_P8S_DATA").is_ok_and(|v| v == "true" || v == "1");
@@ -224,10 +226,10 @@ fn main() -> Result<()> {
         // of 10 minutes to setup this large testnet so let's increase the timeout:
         .with_timeout_per_test(Duration::from_secs(60 * 30))
         .with_setup(setup)
-        .add_test(systest!(test_few_small_messages))
-        .add_test(systest!(test_small_messages))
-        .add_test(systest!(test_few_large_messages))
-        .add_test(systest!(test_large_messages))
+        .add_test(systest!(test; TestParameters { message_size: 1, rps: 1.0 }))
+        .add_test(systest!(test; TestParameters { message_size: 9_500, rps: 1_000.0 }))
+        .add_test(systest!(test; TestParameters { message_size: 1_999_500, rps: 1.0 }))
+        .add_test(systest!(test; TestParameters { message_size: 1_999_500, rps: 5.0 }))
         .with_teardown(teardown)
         .execute_from_args()?;
     Ok(())

rs/tests/consensus/utils/BUILD.bazel

@@ -12,6 +12,7 @@ rust_library(
         "//rs/canister_client",
         "//rs/config",
         "//rs/http_utils",
+        "//rs/limits",
         "//rs/nervous_system/common",
         "//rs/nervous_system/common/test_keys",
         "//rs/nns/cmc",

rs/tests/consensus/utils/Cargo.toml

@@ -17,6 +17,7 @@ ic-base-types = { path = "../../../types/base_types" }
 ic-canister-client = { path = "../../../canister_client" }
 ic-config = { path = "../../../config" }
 ic-http-utils = { path = "../../../http_utils" }
+ic-limits = { path = "../../../limits" }
 ic-management-canister-types-private = { path = "../../../types/management_canister_types" }
 ic-nervous-system-common-test-keys = { path = "../../../nervous_system/common/test_keys" }
 ic-nns-common = { path = "../../../nns/common" }