Merge pull request #1752 from tonistiigi/discard-buildid

solver: make sure job id cleared after build
moby · Oct 26, 2020 · 3d4fa3e · 3d4fa3e
2 parents dec78e3 + cac0b68
commit 3d4fa3e
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/solver/jobs.go b/solver/jobs.go
@@ -230,6 +230,7 @@ type Job struct {
 	pw     progress.Writer
 	span   opentracing.Span
 	values sync.Map
+	id     string
 
 	progressCloser func()
 	SessionID      string
@@ -429,6 +430,7 @@ func (jl *Solver) NewJob(id string) (*Job, error) {
 		pw:             pw,
 		progressCloser: progressCloser,
 		span:           (&opentracing.NoopTracer{}).StartSpan(""),
+		id:             id,
 	}
 	jl.jobs[id] = j
 
@@ -513,6 +515,8 @@ func (j *Job) Discard() error {
 		}
 		st.mu.Unlock()
 	}
+
+	delete(j.list.jobs, j.id)
 	return nil
 }