llb: asyncronous llb graph generation support #1426
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tonistiigi
changed the title
tonistiigi
changed the title
hinshun
reviewed
Apr 3, 2020
| @@ -88,7 +89,14 @@ func goFromGit(repo, tag string) llb.StateOption { | |||
| Dirf("/go/src/%s", repo). | |||
| Run(llb.Shlexf("git checkout -q %s", tag)).Root() | |||
| return func(s llb.State) llb.State { | |||
| return s.With(copyFrom(src, "/go", "/")).Reset(s).Dir(src.GetDir()) | |||
| return s.With(copyFrom(src, "/go", "/")).Reset(s).Async(func(ctx context.Context, s llb.State) (llb.State, error) { | |||
| // TODO: add s.With(s2.DirValue) or s.With(llb.Dir(s2)) or s.Reset(s2, llb.DirMask)? | |||
There was a problem hiding this comment.
Yes. You can comment on which one you prefer though.
There was a problem hiding this comment.
Prefer s.With(llb.Dir(s2))
There was a problem hiding this comment.
Per #1429, need a new solution for this.
hinshun
approved these changes
Apr 3, 2020
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
|
Improved the async test a bit. |
AkihiroSuda
approved these changes
Apr 4, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds new
llb.Asyncmethod that can be used as a building block for adding callbacks to llb generation that can be resolved later. The DAG values are not evaluated untilMarshal()orGet*()methods are called on a graph. These methods also now take context as an argument as these are the actually blocking functions.Follow-up TODOs:
Refactor image meta resolver to async callbacks. This may also require a new API feature that would make sure that resolving image config and pulling image snapshots always resolve to the same image on the same build if they now run completely in parallel. Eg. Dockerfile frontend atm appends a digest to the image ref after resolving a config for this. Could still use this method as well but then pull could only start after the config has been downloaded. @hinsun ideas?
Refactor marshal method to allow returning partial input DAGs when the current node is blocked on a long-running job. Add a
Solvemethod that can takellb.Statedirectly and input and efficiently marshal and subbuild in that case.Provide helpers for doing things like frontend builds and turning image config returned in frontend metadata back into a state.
Refactor dockerfile frontend to lazily evaluate and use
llb.Statefor building up the final image configuration. Currentcontext.TODO()hacks that I added to Dockerfile frontend should not actually be needed as the evaluation is not needed beforestate.Marshal()is called. Added thecontext.TODO()just to get the tests working before continuing.This should make the graph generation slower but not sure if it is meaningful. It could be easily optimized by adding memoized wrappers for cache but not sure where they would be most efficient without some benchmarking code. The old code is not super-optimized either in here, eg. could use something more efficient than a linked list for the values.
Signed-off-by: Tonis Tiigi tonistiigi@gmail.com