cp: integrity check PRs to performance (#20435, #20680, #20714, #20835)#20838
Merged
Conversation
- Reverts #19738 - Restores the check that state/commitment files aren't ahead of block files --------- Co-authored-by: Alex Sharov <AskAlexSharov@gmail.com>
Add `--integrity.budget <duration>` to `erigon seg integrity` that caps total wall-clock time for an integrity run. - When set, checks are sorted cheap → heavy (based on `integrity.FastChecks` order) and each receives a per-check deadline of `remaining / remaining_checks`, so finishing early on a cheap check rolls budget forward to the heavy tail. - On per-check timeout: log `[integrity] budget exhausted, moving on` at INFO and continue to the next check. Not treated as an integrity failure — `--failFast` only reacts to actual integrity errors. - When not set (default): no change in behavior — user-supplied order preserved, no deadline applied. - `BlockReader.IntegrityTxnID` now takes `ctx` and polls every 1000 segments so `BlocksTxnID` honors the budget. - `CheckKvi` producer now checks `ctx` every 100k keys, so skip-heavy runs (e.g. `CommitmentKvi` with `SampleRatio=0`) don't overshoot their slice by minutes. - `doPublishable` takes `datadir.Dirs` directly instead of `*cli.Context`. follow up: - pick to release/3.4 - change automation script to allot 30min budget --------- Co-authored-by: Alex Sharov <AskAlexSharov@gmail.com>
…#20835) ## Summary `seg integrity` runs `CommitmentHistVal` and `StateRootVerifyByHistory` regardless of whether commitment history is persisted on the datadir. Both depend on commitment history `.v` files: - `CheckCommitmentHistVal` iterates `.v` files; when none exist it returns nil after logging `files=0`, which silently masks misconfiguration as a passing check. - `CheckCommitmentHistAtBlkRange` would fail confusingly when trying to read history that isn't there. This PR reads `rawdb.ReadDBCommitmentHistoryEnabled` once at the start of `doIntegrity` and skips both checks with an informative log line when the flag is off. Mirrors the existing `BorEvents` / `BorSpans` chain-guard pattern in the same dispatch switch. The other commitment checks (`CommitmentRoot`, `CommitmentKvi`, `CommitmentKvDeref`, `StateVerify`) operate on the domain `.kv` files and don't depend on history, so they remain unconditional. ## Test plan - [x] `make lint` clean - [x] `go build ./cmd/utils/app/...` succeeds - [x] On a no-history datadir, run `seg integrity --check CommitmentHistVal` and confirm the skip log appears and the command exits 0 instead of "passing" with files=0 - [x] On a history-enabled datadir, confirm `CommitmentHistVal` and `StateRootVerifyByHistory` still execute as before
057bd81 to
a5e0c36
Compare
wmitsuda
approved these changes
Apr 27, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Cherry-picks the integrity-area chain from
mainontoperformance, in order:integrity: restore StateProgress checkintegrity, stagedsync: cap state collation at block snapshots progressadd time budget for integrity checkscmd/utils/app: skip commitment history integrity checks when disabled#20714 is the structural refactor of
doIntegrity(errgroup.Go(switch{...})→runCheck := func{}+ budget loop). Conflicted with performance-only Bloatnet customizations on the same function (#20806, #20810, #20813); resolved by adopting #20714's shape and re-applying the Bloatnet handling forCommitmentKvDeref,CommitmentHistVal, andStateRootVerifyByHistory.failFastarg onCheckCommitmentHistAtBlkRangepreserved (matches performance's signature).Submodule pointer for
execution/tests/execution-spec-testsleft unchanged.make erigon+make lintclean.