cmd/utils/app: wait for background build/merge before MergeLoop in seg retire#21023
Merged
Conversation
…g retire Wait for any background build/merge work kicked off by BuildFiles to drain before MergeLoop — otherwise MergeLoop's mergingFiles CAS would lose to the background merge and return immediately without doing anything.
AskAlexSharov
approved these changes
May 7, 2026
sudeepdino008
added a commit
that referenced
this pull request
May 12, 2026
…, kv integrity (#21135) Cherry-picks to `release/3.4`: - #20939 — cmd/integration: allow resume of commitment rebuild (no history case) - #21023 — cmd/utils/app: wait for background build/merge before MergeLoop in seg retire - #21029 — db/integrity: enable CommitmentRoot check on all .kv files --------- Co-authored-by: moskud <sudeepdino008@gmail.com>
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
seg retire,BuildFilescan leave background build/merge goroutines running. IfMergeLoopruns while one of those is still in flight, itsmergingFilesCAS loses to the background merge andMergeLoopreturns immediately without doing anything.agg.WaitForFiles()betweenBuildFiles/prune andMergeLoopso the merge step actually runs.Test plan
make lintpassesmake erigonbuildserigon seg retireon a datadir where background build/merge is active and confirmMergeLoopperforms merges (previously a no-op)