From ee67e6451b9b3033cdf4b24d4bde5c5bea9e6dcc Mon Sep 17 00:00:00 2001 From: Brian Cho Date: Fri, 1 Mar 2024 23:45:48 -0800 Subject: [PATCH 1/3] Always reset counters --- crates/channel/src/aptos_channel.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/crates/channel/src/aptos_channel.rs b/crates/channel/src/aptos_channel.rs index cc1d15a8b3732..f4a2298463234 100644 --- a/crates/channel/src/aptos_channel.rs +++ b/crates/channel/src/aptos_channel.rs @@ -240,6 +240,9 @@ pub fn new( ) -> (Sender, Receiver) { let max_queue_size_per_key = NonZeroUsize!(max_queue_size_per_key, "aptos_channel cannot be of size 0"); + if let Some(counters) = counters { + counters.reset(); + } let shared_state = Arc::new(Mutex::new(SharedState { internal_queue: PerKeyQueue::new(queue_style, max_queue_size_per_key, counters), waker: None, From 694c3a953330ff9d6ca4922904741bb54127c9dc Mon Sep 17 00:00:00 2001 From: Brian Cho Date: Thu, 22 Feb 2024 16:42:52 -0800 Subject: [PATCH 2/3] Make land-blocking large --- testsuite/forge-cli/src/main.rs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/testsuite/forge-cli/src/main.rs b/testsuite/forge-cli/src/main.rs index 06f2d3f6f9b5c..9663498304bf0 100644 --- a/testsuite/forge-cli/src/main.rs +++ b/testsuite/forge-cli/src/main.rs @@ -18,6 +18,7 @@ use aptos_forge::{ }, ForgeConfig, Options, *, }; +use aptos_global_constants::PREVIEWNET_EXECUTION_MULTIPLIER; use aptos_logger::{info, Level}; use aptos_rest_client::Client as RestClient; use aptos_sdk::{ @@ -602,7 +603,7 @@ fn get_land_blocking_test( ) -> Option { let test = match test_name { "land_blocking" => land_blocking_test_suite(duration), // TODO: remove land_blocking, superseded by below - "realistic_env_max_load" => realistic_env_max_load_test(duration, test_cmd, 7, 5), + "realistic_env_max_load" => realistic_env_max_load_test(duration, test_cmd, 100, 10), "compat" => compat(), "framework_upgrade" => framework_upgrade(), _ => return None, // The test name does not match a land-blocking test @@ -1770,10 +1771,18 @@ fn realistic_env_max_load_test( ForgeConfig::default() .with_initial_validator_count(NonZeroUsize::new(num_validators).unwrap()) .with_initial_fullnode_count(num_fullnodes) + .with_validator_resource_override(NodeResourceOverride { + cpu_cores: Some(58), + memory_gib: Some(200), + }) + .with_fullnode_resource_override(NodeResourceOverride { + cpu_cores: Some(58), + memory_gib: Some(200), + }) .add_network_test(wrap_with_realistic_env(TwoTrafficsTest { inner_traffic: EmitJobRequest::default() .mode(EmitJobMode::MaxLoad { - mempool_backlog: 40000, + mempool_backlog: 14_000 * PREVIEWNET_EXECUTION_MULTIPLIER * 6, }) .init_gas_price_multiplier(20), inner_success_criteria: SuccessCriteria::new( From 94577623852b3e781ec33e638535f81b113796ab Mon Sep 17 00:00:00 2001 From: Brian Cho Date: Sat, 2 Mar 2024 09:15:28 -0800 Subject: [PATCH 3/3] Revert "Make land-blocking large" This reverts commit 694c3a953330ff9d6ca4922904741bb54127c9dc. --- testsuite/forge-cli/src/main.rs | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/testsuite/forge-cli/src/main.rs b/testsuite/forge-cli/src/main.rs index 9663498304bf0..06f2d3f6f9b5c 100644 --- a/testsuite/forge-cli/src/main.rs +++ b/testsuite/forge-cli/src/main.rs @@ -18,7 +18,6 @@ use aptos_forge::{ }, ForgeConfig, Options, *, }; -use aptos_global_constants::PREVIEWNET_EXECUTION_MULTIPLIER; use aptos_logger::{info, Level}; use aptos_rest_client::Client as RestClient; use aptos_sdk::{ @@ -603,7 +602,7 @@ fn get_land_blocking_test( ) -> Option { let test = match test_name { "land_blocking" => land_blocking_test_suite(duration), // TODO: remove land_blocking, superseded by below - "realistic_env_max_load" => realistic_env_max_load_test(duration, test_cmd, 100, 10), + "realistic_env_max_load" => realistic_env_max_load_test(duration, test_cmd, 7, 5), "compat" => compat(), "framework_upgrade" => framework_upgrade(), _ => return None, // The test name does not match a land-blocking test @@ -1771,18 +1770,10 @@ fn realistic_env_max_load_test( ForgeConfig::default() .with_initial_validator_count(NonZeroUsize::new(num_validators).unwrap()) .with_initial_fullnode_count(num_fullnodes) - .with_validator_resource_override(NodeResourceOverride { - cpu_cores: Some(58), - memory_gib: Some(200), - }) - .with_fullnode_resource_override(NodeResourceOverride { - cpu_cores: Some(58), - memory_gib: Some(200), - }) .add_network_test(wrap_with_realistic_env(TwoTrafficsTest { inner_traffic: EmitJobRequest::default() .mode(EmitJobMode::MaxLoad { - mempool_backlog: 14_000 * PREVIEWNET_EXECUTION_MULTIPLIER * 6, + mempool_backlog: 40000, }) .init_gas_price_multiplier(20), inner_success_criteria: SuccessCriteria::new(