dilim/buildkit
1
0
Fork 0
mirror of https://github.com/moby/buildkit.git synced 2026-08-07 00:00:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable parallelization of NewContentHashFunc

Browse Source 
Signed-off-by: Edgar Lee <edgarl@netflix.com>
This commit is contained in:
Edgar Lee
2020-10-21 11:17:34 -07:00
parent dda009a58c
commit cd42b669c9
1 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
solver/llbsolver/result.go
View File

@@ -36,25 +36,23 @@ func NewContentHashFunc(selectors []Selector) solver.ResultBasedCacheFunc {
eg, ctx := errgroup.WithContext(ctx)
for i, sel := range selectors {
// FIXME(tonistiigi): enabling this parallelization seems to create wrong results for some big inputs(like gobuild)
// func(i int) {
// eg.Go(func() error {
if !sel.Wildcard {
dgst, err := contenthash.Checksum(ctx, ref.ImmutableRef, path.Join("/", sel.Path), sel.FollowLinks)
if err != nil {
return "", err
i, sel := i, sel
eg.Go(func() error {
if !sel.Wildcard {
dgst, err := contenthash.Checksum(ctx, ref.ImmutableRef, path.Join("/", sel.Path), sel.FollowLinks)
if err != nil {
return err
}
dgsts[i] = []byte(dgst)
} else {
dgst, err := contenthash.ChecksumWildcard(ctx, ref.ImmutableRef, path.Join("/", sel.Path), sel.FollowLinks)
if err != nil {
return err
}
dgsts[i] = []byte(dgst)
}
dgsts[i] = []byte(dgst)
} else {
dgst, err := contenthash.ChecksumWildcard(ctx, ref.ImmutableRef, path.Join("/", sel.Path), sel.FollowLinks)
if err != nil {
return "", err
}
dgsts[i] = []byte(dgst)
}
// return nil
// })
// }(i)
return nil
})
}
if err := eg.Wait(); err != nil {