llbsolver: create single temp lease for exports for performance #4947
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
Signed-off-by: Tonis Tiigi <[email protected]>
This was referenced May 23, 2024
dmcgowan
reviewed
May 24, 2024
| @@ -366,11 +366,11 @@ func (h *HistoryQueue) addResource(ctx context.Context, l leases.Lease, desc *co | |||
| } | |||
| if _, err := h.hContentStore.Info(ctx, desc.Digest); err != nil { | |||
| if errdefs.IsNotFound(err) { | |||
| ctx, release, err := leaseutil.WithLease(ctx, h.hLeaseManager, leases.WithID("history_migration_"+identity.NewID()), leaseutil.MakeTemporary) | |||
| lr, ctx, err := leaseutil.NewLease(ctx, h.hLeaseManager, leases.WithID("history_migration_"+identity.NewID()), leaseutil.MakeTemporary) | |||
There was a problem hiding this comment.
Is this ctx intended to be used by the call on 383 as well?
There was a problem hiding this comment.
I guess lease on a context doesn't do anything for a AddResource call. Technically the lease created here is on the right namespace for that leasemanger but if this if statement is not reached I don't think we need to add lease for only the AddResource call.
|
Just one question about whether the shadowed ctx variable is intended. From local testing I see a significant performance improvement with this. |
dmcgowan
approved these changes
May 24, 2024
jedevc
approved these changes
May 25, 2024
AkihiroSuda
approved these changes
May 27, 2024
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.
Currently there is a temp lease creation in
GetRemotes()called from exporters, cache-exporting, and provenance creation and gets called for every cache result when walking the graph. 99% time it returns nil or reference to blob that already existed but temp lease is needed for the odd case where it needs to create new blobs to make sure the code does not go to race against containerd GC. Although it looks like creating a lease is justcontext.WithValueit is actually quite expensive as it is written into containerd boltdb. This improves performance in this case by creating a single temp lease for the whole export phase of a single job so calls insideGetRemotes()don't need to create their own one for safety.