Skip to content

fix cache export error handling #6261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 3, 2025
Merged

fix cache export error handling #6261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99c6887
remotecache: skip result on not-found error
tonistiigi Oct 3, 2025
77aa49d
solver: avoid failing cache export on subbranch error
tonistiigi Oct 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions cache/remotecache/azblob/importer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/container"
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/pkg/labels"
cerrdefs "github.com/containerd/errdefs"
"github.com/moby/buildkit/cache/remotecache"
v1 "github.com/moby/buildkit/cache/remotecache/v1"
"github.com/moby/buildkit/session"
Expand Down Expand Up @@ -214,7 +215,7 @@ type ciProvider struct {

func (p *ciProvider) Info(ctx context.Context, dgst digest.Digest) (content.Info, error) {
if dgst != p.desc.Digest {
return content.Info{}, errors.Errorf("content not found %s", dgst)
return content.Info{}, errors.Wrapf(cerrdefs.ErrNotFound, "blob %s", dgst)
}

if p.checked {
Expand All @@ -234,7 +235,7 @@ func (p *ciProvider) Info(ctx context.Context, dgst digest.Digest) (content.Info
}

if !exists {
return content.Info{}, errors.Errorf("blob %s not found", dgst)
return content.Info{}, errors.Wrapf(cerrdefs.ErrNotFound, "blob %s", dgst)
}

p.checked = true
Expand Down
5 changes: 3 additions & 2 deletions cache/remotecache/gha/gha.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (

"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/pkg/labels"
cerrdefs "github.com/containerd/errdefs"
"github.com/moby/buildkit/cache/remotecache"
v1 "github.com/moby/buildkit/cache/remotecache/v1"
"github.com/moby/buildkit/session"
Expand Down Expand Up @@ -440,7 +441,7 @@ type ciProvider struct {

func (p *ciProvider) Info(ctx context.Context, dgst digest.Digest) (content.Info, error) {
if dgst != p.desc.Digest {
return content.Info{}, errors.Errorf("content not found %s", dgst)
return content.Info{}, errors.Wrapf(cerrdefs.ErrNotFound, "blob %s", dgst)
}

if _, err := p.loadEntry(ctx, p.desc); err != nil {
Expand All @@ -465,7 +466,7 @@ func (p *ciProvider) loadEntry(ctx context.Context, desc ocispecs.Descriptor) (*
return nil, err
}
if ce == nil {
return nil, errors.Errorf("blob %s not found", desc.Digest)
return nil, errors.Wrapf(cerrdefs.ErrNotFound, "blob %s", desc.Digest)
}
if p.entries == nil {
p.entries = make(map[digest.Digest]*actionscache.Entry)
Expand Down
3 changes: 2 additions & 1 deletion cache/remotecache/v1/chains.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (

"github.com/cespare/xxhash/v2"
"github.com/containerd/containerd/v2/core/content"
cerrdefs "github.com/containerd/errdefs"
"github.com/moby/buildkit/session"
"github.com/moby/buildkit/solver"
digest "github.com/opencontainers/go-digest"
Expand Down Expand Up @@ -246,7 +247,7 @@ func (p DescriptorProviderPair) Info(ctx context.Context, dgst digest.Digest) (c
return p.InfoProvider.Info(ctx, dgst)
}
if dgst != p.Descriptor.Digest {
return content.Info{}, errors.Errorf("content not found %s", dgst)
return content.Info{}, errors.Wrapf(cerrdefs.ErrNotFound, "blob %s", dgst)
}
return content.Info{
Digest: p.Descriptor.Digest,
Expand Down
53 changes: 33 additions & 20 deletions solver/exporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"errors"
"slices"

cerrdefs "github.com/containerd/errdefs"
digest "github.com/opencontainers/go-digest"
)

Expand Down Expand Up @@ -189,24 +190,28 @@ func (e *exporter) ExportTo(ctx context.Context, t CacheExporterTarget, opt Cach
if (remote == nil || opt.CompressionOpt != nil) && opt.Mode != CacheExportModeRemoteOnly {
res, err := cm.results.Load(ctx, res)
if err != nil {
return nil, err
}
remotes, err := opt.ResolveRemotes(ctx, res)
if err != nil {
return nil, err
}
res.Release(context.TODO())
if remote == nil && len(remotes) > 0 {
remote, remotes = remotes[0], remotes[1:] // pop the first element
}
if opt.CompressionOpt != nil {
for _, r := range remotes { // record all remaining remotes as well
results = append(results, CacheExportResult{
CreatedAt: v.CreatedAt,
Result: r,
EdgeVertex: k.vtx,
EdgeIndex: k.output,
})
if !errors.Is(err, cerrdefs.ErrNotFound) {
return nil, err
}
remote = nil
} else {
remotes, err := opt.ResolveRemotes(ctx, res)
if err != nil {
return nil, err
}
res.Release(context.TODO())
Copy link
Member

@thaJeztah thaJeztah Oct 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like existing code, but there's a context available here; could this / should this be a context.WithoutCancel(ctx) ?

Copy link
Member Author

@tonistiigi tonistiigi Oct 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, these could be updated. This is old code before WithoutCancel was a thing.

if remote == nil && len(remotes) > 0 {
remote, remotes = remotes[0], remotes[1:] // pop the first element
}
if opt.CompressionOpt != nil {
for _, r := range remotes { // record all remaining remotes as well
results = append(results, CacheExportResult{
CreatedAt: v.CreatedAt,
Result: r,
EdgeVertex: k.vtx,
EdgeIndex: k.output,
})
}
}
}
}
Expand All @@ -232,7 +237,7 @@ func (e *exporter) ExportTo(ctx context.Context, t CacheExporterTarget, opt Cach
for _, dep := range deps {
rec, err := dep.CacheKey.Exporter.ExportTo(ctx, t, opt)
if err != nil {
return nil, err
continue
Comment on lines 239 to +240
Copy link
Member

@thaJeztah thaJeztah Oct 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there something to do with this error? (I see it's fully discarded); something to log, or collect in a multi-error (and have a single log or something)?

Copy link
Member Author

@tonistiigi tonistiigi Oct 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could log them as warnings but v0.24 didn't log them as well, so as a regression fix I don't think this change is needed.

}
for _, r := range rec {
srcs[i] = append(srcs[i], CacheLink{Src: r, Selector: string(dep.Selector)})
Expand All @@ -244,7 +249,7 @@ func (e *exporter) ExportTo(ctx context.Context, t CacheExporterTarget, opt Cach
for _, de := range e.edge.secondaryExporters {
recs, err := de.cacheKey.CacheKey.Exporter.ExportTo(mainCtx, t, opt)
if err != nil {
return nil, nil
continue
Comment on lines 251 to +252
Copy link
Member

@thaJeztah thaJeztah Oct 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same for this one

}
for _, r := range recs {
srcs[de.index] = append(srcs[de.index], CacheLink{Src: r, Selector: de.cacheKey.Selector.String()})
Expand All @@ -261,6 +266,14 @@ func (e *exporter) ExportTo(ctx context.Context, t CacheExporterTarget, opt Cach
}
}

// validate deps are present
for _, deps := range srcs {
if len(deps) == 0 {
res[e] = nil
return res[e], nil
}
}

if v != nil && len(deps) == 0 {
cm := v.cacheManager
key := cm.getID(v.key)
Expand Down