Skip to content

[r3.4] wire --erigondb.domain.steps-in-frozen-file for stage_exec and seg retire#21149

Merged
AskAlexSharov merged 3 commits into
release/3.4from
awskii/seg-retire-frozen-flag_34
May 13, 2026
Merged

[r3.4] wire --erigondb.domain.steps-in-frozen-file for stage_exec and seg retire#21149
AskAlexSharov merged 3 commits into
release/3.4from
awskii/seg-retire-frozen-flag_34

Conversation

@awskii

@awskii awskii commented May 12, 2026

Copy link
Copy Markdown
Member

Requires #21148 to be merged before that one.

Cherry-pick of #21025 to release/3.4.

awskii and others added 2 commits May 12, 2026 17:39
…tire (#21025)

Wire the existing `--erigondb.domain.steps-in-frozen-file` flag 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 via
`AggOpts.ErigondbDomainStepsInFrozenFile` when constructing the
aggregator singleton.
- **`erigon seg retire`** — registers the flag on the `seg retire`
subcommand and applies it via a new
`Aggregator.SetErigondbDomainStepsInFrozenFile` runtime setter (the
aggregator is constructed via `openAgg` here, 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 `erigon` binary's
behavior.

Both commits cherry-picked from the `explores_3` exploration branch.

- [x] `make erigon integration` builds clean
- [x] `make lint` reports 0 issues
- [ ] Manual smoke: run `integration stage_exec
--erigondb.domain.steps-in-frozen-file=Inf` and `erigon seg retire
--erigondb.domain.steps-in-frozen-file=64` against a test datadir,
confirm the override-log line fires and merges respect the new cap

(cherry picked from commit ec7a361)
@awskii awskii changed the base branch from awskii/domain-merge-limit_34 to release/3.4 May 12, 2026 17:24
@awskii awskii changed the title [r3.4] wire --erigondb.domain.steps-in-frozen-file for stage_exec and seg retire [r3.4] wire --erigondb.domain.steps-in-frozen-file for stage_exec and seg retire May 12, 2026
@AskAlexSharov AskAlexSharov enabled auto-merge (squash) May 13, 2026 03:02
@AskAlexSharov AskAlexSharov merged commit d3d3b80 into release/3.4 May 13, 2026
23 checks passed
@AskAlexSharov AskAlexSharov deleted the awskii/seg-retire-frozen-flag_34 branch May 13, 2026 08:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants