jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 19:09:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(stages): remove changeset commit threshold in Execution (#3050)

Browse Source
This commit is contained in:
Alexey Shekhirin
2023-06-08 13:34:25 +04:00
committed by GitHub
parent 1075995efc
commit 7cc69d52c6
8 changed files with 6 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bin/reth/src/chain/import.rs
View File

@ -174,7 +174,6 @@ impl ImportCommand {
ExecutionStageThresholds {
max_blocks: config.stages.execution.max_blocks,
max_changes: config.stages.execution.max_changes,
max_changesets: config.stages.execution.max_changesets,
},
)),
)

6
bin/reth/src/debug_cmd/execution.rs
View File

@ -143,11 +143,7 @@ impl Command {
})
.set(ExecutionStage::new(
factory,
ExecutionStageThresholds {
max_blocks: None,
max_changes: None,
max_changesets: None,
},
ExecutionStageThresholds { max_blocks: None, max_changes: None },
)),
)
.build(db);

6
bin/reth/src/debug_cmd/merkle.rs
View File

@ -91,11 +91,7 @@ impl Command {
let factory = reth_revm::Factory::new(self.chain.clone());
let mut execution_stage = ExecutionStage::new(
factory,
ExecutionStageThresholds {
max_blocks: Some(1),
max_changes: None,
max_changesets: None,
},
ExecutionStageThresholds { max_blocks: Some(1), max_changes: None },
);
let mut account_hashing_stage = AccountHashingStage::default();

1
bin/reth/src/node/mod.rs
View File

@ -691,7 +691,6 @@ impl Command {
ExecutionStageThresholds {
max_blocks: stage_conf.execution.max_blocks,
max_changes: stage_conf.execution.max_changes,
max_changesets: stage_conf.execution.max_changesets,
},
)),
)

6
bin/reth/src/stage/dump/merkle.rs
View File

@ -71,11 +71,7 @@ async fn unwind_and_copy<DB: Database>(
// Bring Plainstate to TO (hashing stage execution requires it)
let mut exec_stage = ExecutionStage::new(
reth_revm::Factory::new(Arc::new(MAINNET.clone())),
ExecutionStageThresholds {
max_blocks: Some(u64::MAX),
max_changes: None,
max_changesets: None,
},
ExecutionStageThresholds { max_blocks: Some(u64::MAX), max_changes: None },
);
exec_stage

1
bin/reth/src/stage/run.rs
View File

@ -190,7 +190,6 @@ impl Command {
ExecutionStageThresholds {
max_blocks: Some(batch_size),
max_changes: None,
max_changesets: None,
},
)),
None,

12
crates/config/src/config.rs
View File

@ -196,21 +196,11 @@ pub struct ExecutionConfig {
pub max_blocks: Option<u64>,
/// The maximum amount of state changes to keep in memory before the execution stage commits.
pub max_changes: Option<u64>,
/// The maximum amount of changesets to keep in memory before they are written to the pending
/// database transaction.
///
/// If this is lower than `max_gas`, then history is periodically flushed to the database
/// transaction, which frees up memory.
pub max_changesets: Option<u64>,
}
impl Default for ExecutionConfig {
fn default() -> Self {
Self {
max_blocks: Some(500_000),
max_changes: Some(5_000_000),
max_changesets: Some(1_000_000),
}
Self { max_blocks: Some(500_000), max_changes: Some(5_000_000) }
}
}

35
crates/stages/src/stages/execution.rs
View File

@ -176,14 +176,6 @@ impl<EF: ExecutorFactory> ExecutionStage<EF> {
stage_progress = block_number;
stage_checkpoint.progress.processed += block.gas_used;
// Write history periodically to free up memory
if self.thresholds.should_write_history(state.changeset_size_hint() as u64) {
info!(target: "sync::stages::execution", ?block_number, "Writing history.");
state.write_history_to_db(&**tx)?;
info!(target: "sync::stages::execution", ?block_number, "Wrote history.");
// gas_since_history_write = 0;
}
// Check if we should commit now
if self.thresholds.is_end_of_batch(block_number - start_block, state.size_hint() as u64)
{
@ -431,30 +423,17 @@ impl<EF: ExecutorFactory, DB: Database> Stage<DB> for ExecutionStage<EF> {
///
/// If either of the thresholds (`max_blocks` and `max_changes`) are hit, then the execution stage
/// commits all pending changes to the database.
///
/// A third threshold, `max_changesets`, can be set to periodically write changesets to the
/// current database transaction, which frees up memory.
#[derive(Debug)]
pub struct ExecutionStageThresholds {
/// The maximum number of blocks to process before the execution stage commits.
pub max_blocks: Option<u64>,
/// The maximum amount of state changes to keep in memory before the execution stage commits.
pub max_changes: Option<u64>,
/// The maximum amount of changesets to keep in memory before they are written to the pending
/// database transaction.
///
/// If this is lower than `max_changes`, then history is periodically flushed to the database
/// transaction, which frees up memory.
pub max_changesets: Option<u64>,
}
impl Default for ExecutionStageThresholds {
fn default() -> Self {
Self {
max_blocks: Some(500_000),
max_changes: Some(5_000_000),
max_changesets: Some(1_000_000),
}
Self { max_blocks: Some(500_000), max_changes: Some(5_000_000) }
}
}
@ -465,12 +444,6 @@ impl ExecutionStageThresholds {
blocks_processed >= self.max_blocks.unwrap_or(u64::MAX) ||
changes_processed >= self.max_changes.unwrap_or(u64::MAX)
}
/// Check if the history write threshold has been hit.
#[inline]
pub fn should_write_history(&self, history_changes: u64) -> bool {
history_changes >= self.max_changesets.unwrap_or(u64::MAX)
}
}
#[cfg(test)]
@ -499,11 +472,7 @@ mod tests {
Factory::new(Arc::new(ChainSpecBuilder::mainnet().berlin_activated().build()));
ExecutionStage::new(
factory,
ExecutionStageThresholds {
max_blocks: Some(100),
max_changes: None,
max_changesets: None,
},
ExecutionStageThresholds { max_blocks: Some(100), max_changes: None },
)
}