diff --git a/solver/llbsolver/file/refmanager.go b/solver/llbsolver/file/refmanager.go index e1c58c1e5..b9f3b2ea3 100644 --- a/solver/llbsolver/file/refmanager.go +++ b/solver/llbsolver/file/refmanager.go @@ -11,12 +11,13 @@ import ( "github.com/pkg/errors" ) -func NewRefManager(cm cache.Manager) *RefManager { - return &RefManager{cm: cm} +func NewRefManager(cm cache.Manager, name string) *RefManager { + return &RefManager{cm: cm, desc: name} } type RefManager struct { - cm cache.Manager + cm cache.Manager + desc string } func (rm *RefManager) Prepare(ctx context.Context, ref fileoptypes.Ref, readonly bool, g session.Group) (_ fileoptypes.Mount, rerr error) { @@ -33,7 +34,13 @@ func (rm *RefManager) Prepare(ctx context.Context, ref fileoptypes.Ref, readonly return &Mount{m: m, readonly: readonly}, nil } - mr, err := rm.cm.New(ctx, ir, g, cache.WithDescription("fileop target"), cache.CachePolicyRetain) + desc := "fileop target" + + if d := rm.desc; d != "" { + desc = d + } + + mr, err := rm.cm.New(ctx, ir, g, cache.WithDescription(desc), cache.CachePolicyRetain) if err != nil { return nil, err } diff --git a/solver/llbsolver/ops/file.go b/solver/llbsolver/ops/file.go index 27deec5ca..b1f3e0cfe 100644 --- a/solver/llbsolver/ops/file.go +++ b/solver/llbsolver/ops/file.go @@ -46,7 +46,7 @@ func NewFileOp(v solver.Vertex, op *pb.Op_File, cm cache.Manager, parallelism *s md: cm, numInputs: len(v.Inputs()), w: w, - solver: NewFileOpSolver(w, &file.Backend{}, file.NewRefManager(cm)), + solver: NewFileOpSolver(w, &file.Backend{}, file.NewRefManager(cm, v.Name())), parallelism: parallelism, }, nil }