Repository navigation
Conversation
CPerezz
requested review from
AskAlexSharov,
mh0lt,
sudeepdino008 and
yperbasis
as code owners
October 6, 2026 13:06
…mmitment default Since parallel commitment became the default, reconcileTrieVariant refused every bin-only datadir, so a genesis with binaryTrieTime 0 could not be initialised or started without COMMITMENT_PARALLEL=false. Record whether parallel commitment was requested (env or flag) and refuse only an explicit request; otherwise use the sequential trie the datadir requires.
CPerezz
force-pushed
the
fix/bin-trie-parallel-default
branch
from
October 6, 2026 13:27
a7f0d21 to
a8bc355
Compare
Member
|
thats a no-go fix, bin trie should just ignore the flag. redoing now. |
awskii
added a commit
that referenced
this pull request
Oct 6, 2026
…#24623) Fixes #24612. Alternative to #24617. Since #23831 made parallel commitment the default, `reconcileTrieVariant` refuses every bin-only datadir, so `erigon init` on a genesis with `binaryTrieTime: 0` fails with no flags. The refusal protects nothing: `PickTrieVariant` returns the bin trie before it reads the parallel flag. This drops the refusal and leaves the parallel default alone. ## Changes - `reconcileTrieVariant` no longer refuses parallel commitment on a bin-only datadir and does not touch `ExperimentalParallelCommitment`. - `TestPBinVariantBinDatadirRefusesParallel` becomes `TestPBinVariantBinDatadirResolvesWithParallelDefault`: resolve succeeds, parallel stays on, `PickTrieVariant()` is bin. - The bin test helpers (genesis, rpchelper, PBT builder, acceptance harness) stop forcing parallel off, so they run under the default.
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.
Fixes #24612
Parallel commitment became the default in #23831.
reconcileTrieVariantrefuses parallel commitment on abin-only datadir whenever
ExperimentalParallelCommitmentis true, without telling the default apart from arequest.
Changes:
statecfg.ExperimentalParallelCommitmentExplicitrecords whether parallel commitment was requested:COMMITMENT_PARALLELis present (newdbg.EnvIsSet),--experimental.parallel-commitmentis set(
setParallelCommitment), or it is changed on the integration commands.reconcileTrieVariantstill refuses an explicit request on a bin-only datadir. A default is turned off,with an info log.
commitmentflags.Restoresaves and restores the new flag.