JohnHammond
/
buildkit
mirror of https://github.com/JohnHammond/buildkit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

solver: fix exporters unsafely sharing records 

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
master
Tonis Tiigi 2021-10-08 19:51:11 -07:00
parent ba673bbdab
commit 4cec7a064c
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
solver/exporter.go
View File

@ -11,7 +11,6 @@ type exporter struct {
records []*CacheRecord records []*CacheRecord
record *CacheRecord record *CacheRecord
res []CacheExporterRecord
edge *edge // for secondaryExporters edge *edge // for secondaryExporters
override *bool override *bool
} }
@ -52,9 +51,10 @@ func addBacklinks(t CacheExporterTarget, rec CacheExporterRecord, cm *cacheManag
return rec, nil return rec, nil
} }
type backlinkT struct{} type contextT string
var backlinkKey = backlinkT{} var backlinkKey = contextT("solver/exporter/backlinks")
var resKey = contextT("solver/exporter/res")
func (e *exporter) ExportTo(ctx context.Context, t CacheExporterTarget, opt CacheExportOpt) ([]CacheExporterRecord, error) { func (e *exporter) ExportTo(ctx context.Context, t CacheExporterTarget, opt CacheExportOpt) ([]CacheExporterRecord, error) {
var bkm map[string]CacheExporterRecord var bkm map[string]CacheExporterRecord
@ -66,8 +66,16 @@ func (e *exporter) ExportTo(ctx context.Context, t CacheExporterTarget, opt Cach
bkm = bk.(map[string]CacheExporterRecord) bkm = bk.(map[string]CacheExporterRecord)
} }
var res map[*exporter][]CacheExporterRecord
if r := ctx.Value(resKey); r == nil {
res = map[*exporter][]CacheExporterRecord{}
ctx = context.WithValue(ctx, resKey, res)
} else {
res = r.(map[*exporter][]CacheExporterRecord)
}
if t.Visited(e) { if t.Visited(e) {
return e.res, nil return res[e], nil
} }
t.Visit(e) t.Visit(e)
@ -180,9 +188,9 @@ func (e *exporter) ExportTo(ctx context.Context, t CacheExporterTarget, opt Cach
} }
} }
e.res = allRec res[e] = allRec
return e.res, nil return allRec, nil
} }
func getBestResult(records []*CacheRecord) *CacheRecord { func getBestResult(records []*CacheRecord) *CacheRecord {