Merge pull request #314 from tonistiigi/cancel-fix

solver: don’t cancel child pipes from state change
docker-18.09
Akihiro Suda 2018-03-20 12:21:33 +09:00 committed by GitHub
commit f635b18790
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 3 deletions

View File

@ -667,10 +667,7 @@ func (e *edge) createInputRequests(desiredState edgeStatusType, f *pipeFactory)
e.depRequests[req] = dep
dep.req = req
}
} else if dep.req != nil && !dep.req.Status().Completed {
dep.req.Cancel()
}
// initialize function to compute cache key based on dependency result
if dep.state == edgeStatusComplete && dep.slowCacheReq == nil && e.slowCacheFunc(dep) != nil && e.cacheMap != nil {
fn := e.slowCacheFunc(dep)