Skip to content
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

Remove failpoints from the executor #15721

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Remove failpoints from the executor #15721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e8a4ce
relax forge thresholds
msmouse Jan 13, 2025
73924fc
remove failpoints in executor
msmouse Jan 13, 2025
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
10 changes: 9 additions & 1 deletion execution/executor/src/block_executor/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ use aptos_types::{
};
use aptos_vm::VMBlockExecutor;
use block_tree::BlockTree;
use fail::fail_point;
// use fail::fail_point;
use std::sync::Arc;

pub mod block_tree;
Expand Down Expand Up @@ -232,11 +232,13 @@ where

let execution_output = {
let _timer = GET_BLOCK_EXECUTION_OUTPUT_BY_EXECUTING.start_timer();
/*
fail_point!("executor::block_executor_execute_block", |_| {
Err(ExecutorError::from(anyhow::anyhow!(
"Injected error in block_executor_execute_block"
)))
});
*/

DoGetExecutionOutput::by_transaction_execution(
&self.block_executor,
Expand All @@ -250,9 +252,11 @@ where
let _timer = OTHER_TIMERS.timer_with(&["state_checkpoint"]);

let state_checkpoint_output = THREAD_MANAGER.get_exe_cpu_pool().install(|| {
/*
fail_point!("executor::block_state_checkpoint", |_| {
Err(anyhow::anyhow!("Injected error in block state checkpoint."))
});
*/
DoStateCheckpoint::run(
&execution_output,
parent_output.expect_result_state(),
Expand Down Expand Up @@ -331,9 +335,11 @@ where

let block = self.block_tree.get_block(block_id)?;

/*
fail_point!("executor::pre_commit_block", |_| {
Err(anyhow::anyhow!("Injected error in pre_commit_block.").into())
});
*/

let output = block.output.expect_complete_result();
let num_txns = output.num_transactions_to_commit();
Expand Down Expand Up @@ -369,9 +375,11 @@ where
// Confirm the block to be committed is tracked in the tree.
self.block_tree.get_block(block_id)?;

/*
fail_point!("executor::commit_blocks", |_| {
Err(anyhow::anyhow!("Injected error in commit_blocks.").into())
});
*/

let target_version = ledger_info_with_sigs.ledger_info().version();
self.db
Expand Down
10 changes: 6 additions & 4 deletions testsuite/forge-cli/src/suites/realistic_environment.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ pub(crate) fn realistic_env_fairness_workload_sweep() -> ForgeConfig {
]),
criteria: Vec::new(),
background_traffic: background_traffic_for_sweep_with_latency(
&[(2.0, 3.0, 8.0), (0.1, 25.0, 30.0), (0.1, 30.0, 40.0)],
&[(2.0, 3.0, 8.0), (0.1, 25.0, 30.0), (0.1, 30.0, 45.0)],
false,
),
})
Expand Down Expand Up @@ -217,8 +217,10 @@ pub(crate) fn realistic_env_graceful_workload_sweep() -> ForgeConfig {
(0.1, 2.2, 3.0),
(0.1, 3.5, 5.0),
(0.1, 4.0, 6.0),
(0.1, 2.5, 4.0),
(0.1, 3.5, 5.0),
// TODO - p50 and p90 is set to high, until it is calibrated/understood.
(0.1, 3.0, 5.0),
// TODO - p50 and p90 is set to high, until it is calibrated/understood.
(0.1, 5.0, 10.0),
// TODO - p50 and p90 is set to high, until it is calibrated/understood.
(0.1, 3.0, 10.0),
],
Expand Down Expand Up @@ -485,7 +487,7 @@ pub(crate) fn realistic_network_tuned_for_throughput_test() -> ForgeConfig {
);
} else {
forge_config = forge_config.with_success_criteria(
SuccessCriteria::new(12000)
SuccessCriteria::new(11000)
.add_no_restarts()
/* This test runs at high load, so we need more catchup time */
.add_wait_for_catchup_s(120),
Expand Down
Loading