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.

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

[Execution] Do not hold the Arc of committed block in execution. #9674

Merged
merged 1 commit into from
Aug 16, 2023
Merged
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions execution/executor/src/block_executor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ where
block_id,
transactions,
} = block;
let committed_block = self.block_tree.root_block();
let committed_block_id = self.committed_block_id();
let mut block_vec = self
.block_tree
.get_blocks_opt(&[block_id, parent_block_id])?;
Expand All @@ -203,7 +203,7 @@ where
return Ok(b.output.as_state_compute_result(parent_accumulator));
}

let output = if parent_block_id != committed_block.id && parent_output.has_reconfiguration()
let output = if parent_block_id != committed_block_id && parent_output.has_reconfiguration()
{
info!(
LogSchema::new(LogEntry::BlockExecutor).block_id(block_id),
Expand Down