wire --erigondb.domain.steps-in-frozen-file for stage_exec and seg retire#21025
Merged
Conversation
AskAlexSharov
approved these changes
May 7, 2026
AskAlexSharov
pushed a commit
that referenced
this pull request
May 7, 2026
This was referenced May 12, 2026
Merged
AskAlexSharov
pushed a commit
that referenced
this pull request
May 13, 2026
….steps-in-frozen-file (#21148) Cherry-pick of #20705 to `release/3.4`. Conflict-resolution notes: - Kept `stepSize`/`stepsInFrozenFile` as `uint64` (release/3.4 hasn't picked up the `atomic.Uint64` refactor from main); only the new `erigondbDomainStepsInFrozenFile` override field was added. - Did not pull in unrelated test helpers (`filledDomainWithHashMapAccessor`, `TestDomain_KeyPosResetOnCollisionRetry`) that exist on main but not on `release/3.4`. - `node/eth/backend.go`: kept the `db/consensuschain` import and added `db/config3` alongside it. Prerequisite for cherry-pick of #21025 to `release/3.4`.
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
2 participants
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.
Summary
Wire the existing
--erigondb.domain.steps-in-frozen-fileflag into two more entry points so the domain-only merge cap can be overridden when running these tools directly:integration stage_exec— registers the flag and applies it viaAggOpts.ErigondbDomainStepsInFrozenFilewhen constructing the aggregator singleton.erigon seg retire— registers the flag on theseg retiresubcommand and applies it via a newAggregator.SetErigondbDomainStepsInFrozenFileruntime setter (the aggregator is constructed viaopenAgghere, so the override is applied post-construction, before any merge work begins).History/inverted-index merges are unaffected — the flag still only adjusts the domain merge cap, matching the main
erigonbinary's behavior.Both commits cherry-picked from the
explores_3exploration branch.Test plan
make erigon integrationbuilds cleanmake lintreports 0 issuesintegration stage_exec --erigondb.domain.steps-in-frozen-file=Infanderigon seg retire --erigondb.domain.steps-in-frozen-file=64against a test datadir, confirm the override-log line fires and merges respect the new cap