[SharovBot] fix data race in FilesItem.closeFilesAndRemove#21384
Open
erigon-copilot[bot] wants to merge 1 commit into
Open
[SharovBot] fix data race in FilesItem.closeFilesAndRemove#21384erigon-copilot[bot] wants to merge 1 commit into
erigon-copilot[bot] wants to merge 1 commit into
Conversation
Use sync.Once to ensure closeFilesAndRemove executes at most once per FilesItem, preventing concurrent close from deleteMergeFile and refcntDecrement paths racing on the same instance. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> Co-authored-by: Giulio Rebuffo <giulio.rebuffo@gmail.com>
AskAlexSharov
requested changes
May 24, 2026
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.
Summary
(*FilesItem).closeFilesAndRemove()detected by-raceinTestHistoryVerification_SimpleBlocksdeleteMergeFile(setscanDelete=true, checksrefcount.Load()==0) andrefcntDecrement(doesrefcount.Add(-1)==0 && canDelete.Load()), allowing both paths to concurrently entercloseFilesAndRemove()on the sameFilesItemsync.Oncefield toFilesItemand wrapcloseFilesAndRemove()body inOnce.Do(), ensuring at-most-once execution regardless of concurrent callersTest plan
go test -race -run TestHistoryVerification_SimpleBlocks -count=5 ./execution/verify/...— all 5 runs pass, no DATA RACE warningsgo build ./...passes🤖 Generated with Claude Code