Skip to content

[SharovBot] Fix data race between buildFiles and recalcVisibleFiles #19590

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Giulio2002 merged 2 commits into from
Mar 4, 2026
Merged

[SharovBot] Fix data race between buildFiles and recalcVisibleFiles #19590

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
185bee5
db/state: fix data race between buildFiles and recalcVisibleFiles
Giulio2002 Mar 3, 2026
c28eec3
buildFiles: use agg.BeginFilesRo() instead of manual visibleFilesLock
Giulio2002 Mar 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions db/state/aggregator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,15 +687,17 @@ func (a *Aggregator) buildFiles(ctx context.Context, step kv.Step) error {

g, ctx := errgroup.WithContext(ctx)
g.SetLimit(a.collateAndBuildWorkers)
for _, d := range a.d {

// Use agg.BeginFilesRo() to safely snapshot visible files under visibleFilesLock,
// instead of calling individual domain/ii BeginFilesRo() without synchronization.
ac := a.BeginFilesRo()
for id, d := range a.d {
if d.Disable {
continue
}

d := d
dc := d.BeginFilesRo()
firstStepNotInFiles := dc.FirstStepNotInFiles()
dc.Close()
firstStepNotInFiles := ac.d[id].FirstStepNotInFiles()
if step < firstStepNotInFiles {
continue
}
Expand Down Expand Up @@ -739,9 +741,7 @@ func (a *Aggregator) buildFiles(ctx context.Context, step kv.Step) error {
}

ii := ii
dc := ii.BeginFilesRo()
firstStepNotInFiles := dc.FirstStepNotInFiles()
dc.Close()
firstStepNotInFiles := ac.iis[iikey].FirstStepNotInFiles()
if step < firstStepNotInFiles {
continue
}
Expand All @@ -768,6 +768,7 @@ func (a *Aggregator) buildFiles(ctx context.Context, step kv.Step) error {
return nil
})
}
ac.Close()
if err := g.Wait(); err != nil {
static.CleanupOnError()
return fmt.Errorf("domain collate-build: %w", err)
Expand Down
Loading