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

solver: mark build failed instead of panicking on scheduler error 

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
docker-18.09
Tonis Tiigi 2018-08-28 17:16:23 -07:00
parent c77b6d4759
commit 0d68543b1e
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
solver/edge.go
View File

@ -340,7 +340,7 @@ func (e *edge) unpark(incoming []pipe.Sender, updates, allPipes []pipe.Receiver,
if e.execReq == nil {
if added := e.createInputRequests(desiredState, f, false); !added && !e.hasActiveOutgoing && !cacheMapReq {
logrus.Errorf("buildkit scheluding error: leaving incoming open. forcing solve. please report this with BUILDKIT_SCHEDULER_DEBUG=1")
logrus.Errorf("buildkit scheluding error: leaving incoming open. forcing solve. Please report this with BUILDKIT_SCHEDULER_DEBUG=1")
e.createInputRequests(desiredState, f, true)
}
}
@ -354,6 +354,11 @@ func (e *edge) makeExportable(k *CacheKey, records []*CacheRecord) ExportableCac
}
}
func (e *edge) markFailed(f *pipeFactory, err error) {
e.err = err
e.postpone(f)
}
// processUpdate is called by unpark for every updated pipe request
func (e *edge) processUpdate(upt pipe.Receiver) (depChanged bool) {
// response for cachemap request

11
solver/scheduler.go
View File

@ -120,11 +120,14 @@ func (s *scheduler) dispatch(e *edge) {
}
}
pf := &pipeFactory{s: s, e: e}
// unpark the edge
debugSchedulerPreUnpark(e, inc, updates, out)
e.unpark(inc, updates, out, &pipeFactory{s: s, e: e})
e.unpark(inc, updates, out, pf)
debugSchedulerPostUnpark(e, inc)
postUnpark:
// set up new requests that didn't complete/were added by this run
openIncoming := make([]*edgePipe, 0, len(inc))
for _, r := range s.incoming[e] {
@ -170,10 +173,12 @@ func (s *scheduler) dispatch(e *edge) {
// to error the edge instead. They can only appear from algorithm bugs in
// unpark(), not for any external input.
if len(openIncoming) > 0 && len(openOutgoing) == 0 {
panic("invalid dispatch: return leaving incoming open")
e.markFailed(pf, errors.New("buildkit scheduler error: return leaving incoming open. Please report this with BUILDKIT_SCHEDULER_DEBUG=1"))
goto postUnpark
}
if len(openIncoming) == 0 && len(openOutgoing) > 0 {
panic("invalid dispatch: return leaving outgoing open")
e.markFailed(pf, errors.New("buildkit scheduler error: return leaving outgoing open. Please report this with BUILDKIT_SCHEDULER_DEBUG=1"))
goto postUnpark
}
}