history: make sure build record is finalized before exporting - #3152
#3152Merged
tonistiigi merged 2 commits intoMay 13, 2025
docker:masterdocker/buildx:masterfrom
crazy-max:history-export-finalizecrazy-max/buildx:history-export-finalizeCopy head branch name to clipboard
Merged
history: make sure build record is finalized before exporting#3152tonistiigi merged 2 commits intodocker:masterdocker/buildx:masterfrom crazy-max:history-export-finalizecrazy-max/buildx:history-export-finalizeCopy head branch name to clipboard
tonistiigi merged 2 commits into
docker:masterdocker/buildx:masterfrom
crazy-max:history-export-finalizecrazy-max/buildx:history-export-finalizeCopy head branch name to clipboard
Conversation
tonistiigi
reviewed
Apr 23, 2025
tonistiigi
left a comment
Member
There was a problem hiding this comment.
As discussed offline:
- Finalize should only happen if
Trace==nil - For export, we can leave some opt-in mechanism to force finalize, so we don't need a sleep to wait for the client traces to finish up if the user can already confirm it.
crazy-max
force-pushed
the
history-export-finalize
branch
from
May 12, 2025 14:27
01e93be to
7d47527
Compare
tonistiigi
reviewed
May 12, 2025
crazy-max
force-pushed
the
history-export-finalize
branch
from
May 13, 2025 09:32
7d47527 to
0d9dac8
Compare
crazy-max
force-pushed
the
history-export-finalize
branch
6 times, most recently
from
May 13, 2025 11:18
23cd56d to
b8b6ac6
Compare
crazy-max
commented
May 13, 2025
Comment on lines
+253
to
+269
| for _, node := range nodes { | ||
| node := node | ||
| eg.Go(func() error { | ||
| if node.Driver == nil { | ||
| return nil | ||
| } | ||
| c, err := node.Driver.Client(ctx) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| _, err = c.ControlClient().UpdateBuildHistory(ctx, &controlapi.UpdateBuildHistoryRequest{ | ||
| Ref: ref, | ||
| Finalize: true, | ||
| }) | ||
| return err | ||
| }) | ||
| } |
Member
Author
There was a problem hiding this comment.
@tonistiigi For multi-node case I think this is safe even if the ref doesn't exist on unrelated node: https://github.com/moby/buildkit/blob/b46daef219fd318bd0f9c8f630472af771b2bb4a/solver/llbsolver/history.go#L676-L686
tonistiigi
reviewed
May 13, 2025
| } | ||
| } | ||
| } | ||
| recs, err = queryRecords(ctx, ref, nodes, &queryOptions{ |
Member
There was a problem hiding this comment.
only do this if some records were finalized
| ### <a name="finalize"></a> Ensure build records are finalized before exporting (--finalize) | ||
|
|
||
| Clients can report their own traces concurrently and not all traces may be | ||
| finalized when a build is completed. Use the `--finalize` flag to ensure all |
Member
There was a problem hiding this comment.
"not all traces may be
saved yet by the time of the export"
crazy-max
force-pushed
the
history-export-finalize
branch
from
May 13, 2025 15:08
b8b6ac6 to
bc30077
Compare
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
crazy-max
force-pushed
the
history-export-finalize
branch
from
May 13, 2025 15:17
bc30077 to
68ce10c
Compare
tonistiigi
approved these changes
May 13, 2025
This was referenced May 15, 2025
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
fixes #3149