Merge pull request #40780 from thaJeztah/19.03_backport_map_sync

cpuguy83 · web-flow · commit 46b968694936 · 2020-04-06T08:56:01.000-07:00
[19.03 backport] builder: fix concurrent map write
Upstream-commit: 1e1caccb13108270fa27207f6c1177ecdc9d309d
Component: engine
diff --git a/components/engine/builder/builder-next/builder.go b/components/engine/builder/builder-next/builder.go
@@ -241,7 +241,9 @@ func (b *Builder) Build(ctx context.Context, opt backend.BuildConfig) (*builder.
 		}
 
 		defer func() {
+			b.mu.Lock()
 			delete(b.jobs, buildID)
+			b.mu.Unlock()
 		}()
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,9 @@ func (b Builder) Build(ctx context.Context, opt backend.BuildConfig) (builder.`
`241`	`241`	`}`
`242`	`242`
`243`	`243`	`defer func() {`
	`244`	`+ b.mu.Lock()`
`244`	`245`	`delete(b.jobs, buildID)`
	`246`	`+ b.mu.Unlock()`
`245`	`247`	`}()`
`246`	`248`	`}`
`247`	`249`