Skip to content

revert(engine): remove debug logging and revert timeout/receipt-flush changes#190

Closed
chee-chyuan wants to merge 1406 commits into
developfrom
develop-v2.2-new
Closed

revert(engine): remove debug logging and revert timeout/receipt-flush changes#190
chee-chyuan wants to merge 1406 commits into
developfrom
develop-v2.2-new

Conversation

@chee-chyuan
Copy link
Copy Markdown

Reverts commits 1486308 through 5aa3129 added during debugging of block import hang issues.

  • Remove debug/warn logs for engine message flow, backpressure, post-execution and state root tracing
  • Remove tracing dependency added to reth-engine-primitives
  • Revert receipt-root task flush added for post-finalization receipts
  • Remove timeout on triedb prefetch result wait

ArshLabs and others added 30 commits April 11, 2026 05:13
…… (#22668)

Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
…n beacon-api-sse (#23458)

Co-authored-by: Matthias Seitz <19890894+mattsse@users.noreply.github.com>
Co-authored-by: Arsenii Kulikov <62447812+klkvr@users.noreply.github.com>
Co-authored-by: Arsenii Kulikov <klkvrr@gmail.com>
Co-authored-by: github-merge-queue <118344674+github-merge-queue@users.noreply.github.com>
Co-authored-by: Amp <amp@ampcode.com>
Co-authored-by: DaniPopes <57450786+DaniPopes@users.noreply.github.com>
…#22289)

Signed-off-by: jsign <jsign.uy@gmail.com>
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
Co-authored-by: Brian Picciano <me@mediocregopher.com>
Co-authored-by: Amp <amp@ampcode.com>
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
Co-authored-by: Soubhik Singha Mahapatra <soubhiksmp2004@gmail.com>
…(#23485)

Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
Co-authored-by: Ishika Choudhury <117741714+Rimeeeeee@users.noreply.github.com>
Co-authored-by: Alexey Shekhirin <5773434+shekhirin@users.noreply.github.com>
Co-authored-by: Alexey Shekhirin <github@shekhirin.com>
Co-authored-by: Soubhik Singha Mahapatra <soubhiksmp2004@gmail.com>
Co-authored-by: Soubhik Singha Mahapatra <160333583+Soubhik-10@users.noreply.github.com>
Co-authored-by: Brian Picciano <933154+mediocregopher@users.noreply.github.com>
Co-authored-by: Amp <amp@ampcode.com>
Co-authored-by: steven <corderosteven6@gmail.com>
Co-authored-by: Derek Cofausper <256792747+decofe@users.noreply.github.com>
Co-authored-by: Brian Picciano <933154+mediocregopher@users.noreply.github.com>
…ks (#23494)

Co-authored-by: mediocregopher <mediocregopher@users.noreply.github.com>
Co-authored-by: Amp <amp@ampcode.com>
… (#23356)

Co-authored-by: Derek Cofausper <256792747+decofe@users.noreply.github.com>
Co-authored-by: Emma Jamieson-Hoare <21029500+emmajam@users.noreply.github.com>
…ror/never) (#23501)

Co-authored-by: Amp <amp@ampcode.com>
Co-authored-by: Soubhik Singha Mahapatra <soubhiksmp2004@gmail.com>
Co-authored-by: Soubhik Singha Mahapatra <160333583+Soubhik-10@users.noreply.github.com>
chee-chyuan and others added 26 commits May 5, 2026 20:55
…ectors

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
… sidecar

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
# Conflicts:
#	.github/workflows/lint.yml
#	Cargo.lock
#	Cargo.toml
#	crates/engine/tree/src/tree/mod.rs
#	crates/engine/tree/src/tree/payload_validator.rs
#	crates/net/network/src/transactions/config.rs
#	crates/net/network/src/transactions/constants.rs
#	crates/net/network/src/transactions/mod.rs
#	crates/node/core/src/args/engine.rs
#	crates/node/core/src/args/network.rs
#	crates/stages/api/src/pipeline/mod.rs
#	crates/storage/provider/src/providers/consistent.rs
#	crates/storage/provider/src/providers/database/provider.rs
#	crates/storage/provider/src/providers/state/historical.rs
#	crates/transaction-pool/src/traits.rs
#	deny.toml
#	docs/vocs/docs/pages/cli/reth/node.mdx
Update Cargo.lock to pin reth-core git deps to the correct
commit on v0.3.1-v2 (version 0.3.1) and apply nightly fmt fixes.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
…r type

- HistoricalStateProviderRef::new now takes changeset_cache (3rd arg)
- Add with_pipeline_consistency to HistoricalStateProvider impl block
- Fix let block_number → let mut block_number in history_by_block_hash
- Use MemoryBoundedReceiver for transaction_events (keep reannounce timer)
- Update all callsites to pass ChangesetCache

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
- Add missing block_timestamp field to TransactionSource::Block in rpc-eth-api
- Add missing decoded_bal field to ExecutionEnv initializer in payload_validator
- Remove extra None arg from spawn_caching_with call in payload_processor
- Fix overlay_factory/provider_builder type mismatches in payload_validator
- Fix history_by_block_number call to use provider_factory instead of DatabaseProvider
- Remove unused InsertBlockValidationError import in engine tree mod.rs
- Remove redundant clones in payload_validator (provider_factory, overlay_builder)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Brings BSC-specific updates from origin/develop into the v2.2.0 baseline:
- Relax precompile cache limits (#188)
- Switch rust-eth-triedb dependency from tag v0.0.2 to develop branch (#187)
- Cross-region peer/pathdb fixes: UselessPeer declassification, TD reporting,
  blob sidecar retention, pathdb/MDBX ordering invariant, graceful shutdown (#175)
- Do not cache internal block execution errors in invalid_headers (#131)
- Propagate MultiProofTask worker errors to sparse trie (#123)

For source code conflicts, HEAD (v2.2.0) was kept as the base since it has
a more advanced architecture. BSC-specific fixes already present in HEAD are
retained; dependency and advisory changes from develop are applied on top.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Bump transitive windows-sys dependencies to latest compatible versions.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
…he references

Two merge artifacts:
- Duplicate ParliaSnapshotBlob struct and impls in db-api models/mod.rs
- OverlayBuilder methods referencing overlay_cache field that belongs to
  OverlayStateProviderFactory, not OverlayBuilder

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
…launch

Add logs to aid diagnosing block import issues:
- engine::api: trace when NewPayload is sent via ConsensusEngineHandle
- engine::tree: trace when engine tree receives NewPayload
- engine: debug when engine orchestrator is being built
- reth::node: info when engine node launch begins

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Log persistence_gap, threshold, and stall duration at warn level so
backpressure is visible without enabling debug/trace on the engine target.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
…gh engine

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Adds warn-level logs at every stage after execute_block completes
to identify which step is blocking on_new_payload:
- After receipt_root wait
- Inside validate_post_execution (start, post-receipt-check, pre/post hashed_state.get)
- Before state root computation (prints strategy)
- Inside await_state_root_with_timeout (pre-wait, no-timeout path)
- Inside serial-root task (start, pre/post state_root_with_updates)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
`receipt_tx` was dropped immediately after `execute_transactions`
returned, before `executor.finish()` ran. Any receipts appended during
finalization (e.g. system transaction receipts on BSC) were never sent
to the background receipt-root task, causing it to see fewer receipts
than expected and silently fail to compute the root.

Fix by carrying `last_sent_len` out of `execute_transactions`, running
`finish()` first, then flushing any remaining receipts before dropping
the sender — matching the pattern in the upstream develop branch.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
…root hang

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
…triedb state root

Pinpoint whether hang is at terminate_caching, triedb_preftch_result,
or to_triedb_hashed_post_state before the blocking state root call.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
The prefetch task can take minutes for blocks with large state deltas
(e.g. BSC block 1 genesis deployment). Previously this blocked the
engine tree thread indefinitely via recv(). Now uses recv_timeout(5s)
so the state root computation proceeds without prefetch state on slow
prefetchers, allowing the chain to make progress.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
…task

The changeset background task previously held an MDBX read-only transaction
open for its entire duration, including the slow wait_cloned() trie computation
phase. This blocked MDBX GC during write commits, causing periodic ~16-second
stalls that prevented the validator from producing in-turn blocks on BSC.

Pre-warm the overlay_cache on the engine loop thread (preserving the existing
changeset-cache eviction race fix), drop the provider immediately, then open a
fresh short-lived read transaction inside the task just before compute_trie_changesets.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
… changes

Reverts commits 1486308 through 5aa3129:
- Remove debug/warn logs added for engine message flow tracing
- Remove tracing dependency added to reth-engine-primitives
- Remove backpressure warn logs
- Remove post-execution and state root hang warn logs
- Revert receipt-root task flush added for post-finalization receipts
- Remove timeout on triedb prefetch result wait

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@chee-chyuan chee-chyuan requested a review from joey0612 as a code owner May 26, 2026 02:43
@chee-chyuan
Copy link
Copy Markdown
Author

Closing — will reopen as a proper PR targeting develop-v2.2-new from a feature branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.