Commit ec7a361
authored
wire --erigondb.domain.steps-in-frozen-file for stage_exec and seg retire (#21025)
## Summary
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.
## Test plan
- [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 cap1 parent a81cc87 commit ec7a361
4 files changed
Lines changed: 68 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
48 | 48 | | |
49 | 49 | | |
50 | 50 | | |
51 | | - | |
52 | | - | |
53 | | - | |
54 | | - | |
55 | | - | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
56 | 57 | | |
57 | 58 | | |
58 | 59 | | |
| |||
203 | 204 | | |
204 | 205 | | |
205 | 206 | | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
206 | 213 | | |
207 | 214 | | |
208 | 215 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| 27 | + | |
27 | 28 | | |
28 | 29 | | |
29 | 30 | | |
| |||
36 | 37 | | |
37 | 38 | | |
38 | 39 | | |
| 40 | + | |
39 | 41 | | |
40 | 42 | | |
41 | 43 | | |
42 | 44 | | |
43 | 45 | | |
| 46 | + | |
44 | 47 | | |
45 | 48 | | |
46 | 49 | | |
| |||
322 | 325 | | |
323 | 326 | | |
324 | 327 | | |
| 328 | + | |
325 | 329 | | |
326 | 330 | | |
327 | 331 | | |
| |||
1073 | 1077 | | |
1074 | 1078 | | |
1075 | 1079 | | |
1076 | | - | |
| 1080 | + | |
| 1081 | + | |
| 1082 | + | |
| 1083 | + | |
| 1084 | + | |
| 1085 | + | |
| 1086 | + | |
| 1087 | + | |
| 1088 | + | |
| 1089 | + | |
| 1090 | + | |
| 1091 | + | |
| 1092 | + | |
| 1093 | + | |
| 1094 | + | |
| 1095 | + | |
| 1096 | + | |
| 1097 | + | |
| 1098 | + | |
| 1099 | + | |
| 1100 | + | |
| 1101 | + | |
1077 | 1102 | | |
1078 | 1103 | | |
1079 | 1104 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
189 | 189 | | |
190 | 190 | | |
191 | 191 | | |
| 192 | + | |
192 | 193 | | |
193 | 194 | | |
194 | 195 | | |
| |||
3192 | 3193 | | |
3193 | 3194 | | |
3194 | 3195 | | |
| 3196 | + | |
| 3197 | + | |
| 3198 | + | |
| 3199 | + | |
| 3200 | + | |
| 3201 | + | |
| 3202 | + | |
| 3203 | + | |
| 3204 | + | |
| 3205 | + | |
| 3206 | + | |
| 3207 | + | |
| 3208 | + | |
| 3209 | + | |
| 3210 | + | |
| 3211 | + | |
| 3212 | + | |
| 3213 | + | |
| 3214 | + | |
| 3215 | + | |
| 3216 | + | |
3195 | 3217 | | |
3196 | 3218 | | |
3197 | 3219 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
273 | 273 | | |
274 | 274 | | |
275 | 275 | | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
| 279 | + | |
| 280 | + | |
| 281 | + | |
| 282 | + | |
| 283 | + | |
276 | 284 | | |
277 | 285 | | |
278 | 286 | | |
| |||
0 commit comments