Skip to content

Commit

Permalink
[Forge Stable] Fix inconsistencies in node configs.
Browse files Browse the repository at this point in the history
  • Loading branch information
JoshLind committed Nov 27, 2023
1 parent 12cb89a commit a2decd9
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions testsuite/forge-cli/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -788,7 +788,6 @@ fn run_consensus_only_realistic_env_max_tps() -> ForgeConfig {

fn optimize_for_maximum_throughput(config: &mut NodeConfig) {
mempool_config_practically_non_expiring(&mut config.mempool);
state_sync_config_execute_transactions(&mut config.state_sync);

config
.consensus
Expand Down Expand Up @@ -1227,11 +1226,6 @@ fn graceful_overload() -> ForgeConfig {
fn realistic_env_graceful_overload() -> ForgeConfig {
ForgeConfig::default()
.with_initial_validator_count(NonZeroUsize::new(20).unwrap())
// if we have full nodes for subset of validators, TPS drops.
// Validators without VFN are not creating batches,
// as no useful transaction reach their mempool.
// something to potentially improve upon.
// So having VFNs for all validators
.with_initial_fullnode_count(20)
.add_network_test(wrap_with_realistic_env(TwoTrafficsTest {
inner_traffic: EmitJobRequest::default()
Expand All @@ -1257,7 +1251,7 @@ fn realistic_env_graceful_overload() -> ForgeConfig {
.with_success_criteria(
SuccessCriteria::new(900)
.add_no_restarts()
.add_wait_for_catchup_s(120)
.add_wait_for_catchup_s(180) // 3 minutes
.add_system_metrics_threshold(SystemMetricsThreshold::new(
// overload test uses more CPUs than others, so increase the limit
// Check that we don't use more than 18 CPU cores for 30% of the time.
Expand Down Expand Up @@ -1872,6 +1866,7 @@ fn realistic_network_tuned_for_throughput_test() -> ForgeConfig {
// Experimental delayed QC aggregation
config.consensus.qc_aggregator_type = QcAggregatorType::default_delayed();

// Increase the concurrency level
if USE_CRAZY_MACHINES {
config.execution.concurrency_level = 48;
}
Expand All @@ -1887,12 +1882,17 @@ fn realistic_network_tuned_for_throughput_test() -> ForgeConfig {
}));

if ENABLE_VFNS {
// if we have full nodes for subset of validators, TPS drops.
// Validators without VFN are not creating batches,
// as no useful transaction reach their mempool.
// something to potentially improve upon.
// So having VFNs for all validators
forge_config = forge_config.with_initial_fullnode_count(VALIDATOR_COUNT);
forge_config = forge_config
.with_initial_fullnode_count(VALIDATOR_COUNT)
.with_fullnode_override_node_config_fn(Arc::new(|config, _| {
// Experimental storage optimizations
config.storage.rocksdb_configs.enable_storage_sharding = true;

// Increase the concurrency level
if USE_CRAZY_MACHINES {
config.execution.concurrency_level = 48;
}
}));
}

if USE_CRAZY_MACHINES {
Expand All @@ -1909,7 +1909,7 @@ fn realistic_network_tuned_for_throughput_test() -> ForgeConfig {
SuccessCriteria::new(25000)
.add_no_restarts()
.add_wait_for_catchup_s(60),
/* Doesn't work with out event indices
/* Doesn't work without event indices
.add_chain_progress(StateProgressThreshold {
max_no_progress_secs: 10.0,
max_round_gap: 4,
Expand All @@ -1929,7 +1929,7 @@ fn realistic_network_tuned_for_throughput_test() -> ForgeConfig {
// Check that we don't use more than 10 GB of memory for 30% of the time.
MetricsThreshold::new_gb(10.0, 30),
)),
/* Doens't work without event indices
/* Doesn't work without event indices
.add_chain_progress(StateProgressThreshold {
max_no_progress_secs: 10.0,
max_round_gap: 4,
Expand Down

0 comments on commit a2decd9

Please sign in to comment.