alextab93/buildx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

imagetools: share ingester across concurrent copies

Browse Source 
Reuse a single ingester per target repository when imagetools create
copies multiple manifests in parallel.

This lets the pushing ingester serialize same-digest pushes and avoids
racing duplicate blob uploads against registries to work around bug in
Registry v3.0.0 (and possibly others).

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
Tonis Tiigi
2026-03-17 17:18:55 -07:00
parent c461e702bf
commit e4f6e373af
2 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/imagetools/create.go
+18 -6
View File
@@ -252,6 +252,19 @@ func (r *Resolver) Push(ctx context.Context, ref *Location, desc ocispecs.Descri
}
func (r *Resolver) Copy(ctx context.Context, src *Source, dest *Location) error {
ingester, err := r.IngesterForLocation(ctx, dest)
if err != nil {
return err
}
return r.CopyWithIngester(ctx, src, dest, ingester)
}
// CopyWithIngester copies a source manifest and its referrers to the
// destination using the provided ingester. Callers that issue multiple
// concurrent copies to the same destination should share a single ingester
// so that the underlying per-digest locking prevents duplicate blob pushes
// from racing against each other.
func (r *Resolver) CopyWithIngester(ctx context.Context, src *Source, dest *Location, ingester content.Ingester) error {
ctx = remotes.WithMediaTypeKeyPrefix(ctx, "application/vnd.in-toto+json", "intoto")
ctx = remotes.WithMediaTypeKeyPrefix(ctx, "application/vnd.oci.empty.v1+json", "empty")
@@ -268,10 +281,6 @@ func (r *Resolver) Copy(ctx context.Context, src *Source, dest *Location) error
if err != nil {
return err
}
ingester, err := r.ingesterForLocation(dest)
if err != nil {
return err
}
referrers := &referrersProvider{base: referrersFunc(func(ctx context.Context, subject ocispecs.Descriptor) ([]ocispecs.Descriptor, error) {
descs, err := r.FetchReferrers(ctx, src.Ref, subject.Digest)
@@ -526,9 +535,12 @@ func dedupeDescriptors(descs []ocispecs.Descriptor) []ocispecs.Descriptor {
return out
}
func (r *Resolver) ingesterForLocation(loc *Location) (content.Ingester, error) {
// IngesterForLocation returns a content ingester for the given location.
// For registry locations a new pusher is created; for OCI layout locations
// the local content store is returned.
func (r *Resolver) IngesterForLocation(ctx context.Context, loc *Location) (content.Ingester, error) {
if loc.IsRegistry() {
p, err := r.registryResolver().Pusher(context.TODO(), loc.Name())
p, err := r.registryResolver().Pusher(ctx, loc.Name())
if err != nil {
return nil, err
}