Skip to content
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

[v0.18] pick llb metadata regression on version conflict fix #5564

Merged
merged 2 commits into from
Dec 4, 2024
Merged

[v0.18] pick llb metadata regression on version conflict fix #5564

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
64293f9
llbsolver: tie op metadata to the op before recomputing digests
jsternberg Dec 3, 2024
ec39add
llbsolver: fix recompute test and avoid struct copy
tonistiigi Dec 3, 2024
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
31 changes: 19 additions & 12 deletions solver/llbsolver/vertex.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,8 @@ func (dpc *detectPrunedCacheID) Load(op *pb.Op, md *pb.OpMetadata, opt *solver.V
}

func Load(ctx context.Context, def *pb.Definition, polEngine SourcePolicyEvaluator, opts ...LoadOpt) (solver.Edge, error) {
return loadLLB(ctx, def, polEngine, func(dgst digest.Digest, pbOp *pb.Op, load func(digest.Digest) (solver.Vertex, error)) (solver.Vertex, error) {
opMetadata := def.Metadata[string(dgst)]
vtx, err := newVertex(dgst, pbOp, opMetadata, load, opts...)
return loadLLB(ctx, def, polEngine, func(dgst digest.Digest, op *op, load func(digest.Digest) (solver.Vertex, error)) (solver.Vertex, error) {
vtx, err := newVertex(dgst, op.Op, op.Metadata, load, opts...)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -198,7 +197,7 @@ func newVertex(dgst digest.Digest, op *pb.Op, opMeta *pb.OpMetadata, load func(d
return vtx, nil
}

func recomputeDigests(ctx context.Context, all map[digest.Digest]*pb.Op, visited map[digest.Digest]digest.Digest, dgst digest.Digest) (digest.Digest, error) {
func recomputeDigests(ctx context.Context, all map[digest.Digest]*op, visited map[digest.Digest]digest.Digest, dgst digest.Digest) (digest.Digest, error) {
if dgst, ok := visited[dgst]; ok {
return dgst, nil
}
Expand Down Expand Up @@ -235,30 +234,38 @@ func recomputeDigests(ctx context.Context, all map[digest.Digest]*pb.Op, visited
return newDgst, nil
}

// op is a private wrapper around pb.Op that includes its metadata.
type op struct {
*pb.Op
Metadata *pb.OpMetadata
}

// loadLLB loads LLB.
// fn is executed sequentially.
func loadLLB(ctx context.Context, def *pb.Definition, polEngine SourcePolicyEvaluator, fn func(digest.Digest, *pb.Op, func(digest.Digest) (solver.Vertex, error)) (solver.Vertex, error)) (solver.Edge, error) {
func loadLLB(ctx context.Context, def *pb.Definition, polEngine SourcePolicyEvaluator, fn func(digest.Digest, *op, func(digest.Digest) (solver.Vertex, error)) (solver.Vertex, error)) (solver.Edge, error) {
if len(def.Def) == 0 {
return solver.Edge{}, errors.New("invalid empty definition")
}

allOps := make(map[digest.Digest]*pb.Op)
allOps := make(map[digest.Digest]*op)

var lastDgst digest.Digest

for _, dt := range def.Def {
var op pb.Op
if err := op.UnmarshalVT(dt); err != nil {
var pbop pb.Op
if err := pbop.Unmarshal(dt); err != nil {
return solver.Edge{}, errors.Wrap(err, "failed to parse llb proto op")
}
dgst := digest.FromBytes(dt)
if polEngine != nil {
if _, err := polEngine.Evaluate(ctx, op.GetSource()); err != nil {
if _, err := polEngine.Evaluate(ctx, pbop.GetSource()); err != nil {
return solver.Edge{}, errors.Wrap(err, "error evaluating the source policy")
}
}

allOps[dgst] = &op
allOps[dgst] = &op{
Op: &pbop,
Metadata: def.Metadata[string(dgst)],
}
lastDgst = dgst
}

Expand Down Expand Up @@ -300,7 +307,7 @@ func loadLLB(ctx context.Context, def *pb.Definition, polEngine SourcePolicyEval
return nil, errors.Errorf("invalid missing input digest %s", dgst)
}

if err := opsutils.Validate(op); err != nil {
if err := opsutils.Validate(op.Op); err != nil {
return nil, err
}

Expand Down
20 changes: 10 additions & 10 deletions solver/llbsolver/vertex_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,20 @@ func TestRecomputeDigests(t *testing.T) {
require.NoError(t, err)
op2Digest := digest.FromBytes(op2Data)

all := map[digest.Digest]*pb.Op{
newDigest: op1,
op2Digest: op2,
all := map[digest.Digest]*op{
newDigest: {Op: op1},
op2Digest: {Op: op2},
}
visited := map[digest.Digest]digest.Digest{oldDigest: newDigest}

updated, err := recomputeDigests(context.Background(), all, visited, op2Digest)
require.NoError(t, err)
require.Len(t, visited, 2)
require.Len(t, all, 2)
assert.Equal(t, op1, all[newDigest])
assert.Equal(t, op1, all[newDigest].Op)
require.Equal(t, newDigest, visited[oldDigest])
require.Equal(t, op1, all[newDigest])
assert.Equal(t, op2, all[updated])
require.Equal(t, op1, all[newDigest].Op)
assert.Equal(t, op2, all[updated].Op)
require.Equal(t, newDigest, digest.Digest(op2.Inputs[0].Digest))
assert.NotEqual(t, op2Digest, updated)
}
Expand Down Expand Up @@ -88,14 +88,14 @@ func TestIngestDigest(t *testing.T) {
// Read the definition from the test data and ensure it uses the
// canonical digests after recompute.
var lastDgst digest.Digest
all := map[digest.Digest]*pb.Op{}
all := map[digest.Digest]*op{}
for _, in := range def.Def {
op := new(pb.Op)
err := op.Unmarshal(in)
opNew := new(pb.Op)
err := opNew.Unmarshal(in)
require.NoError(t, err)

lastDgst = digest.FromBytes(in)
all[lastDgst] = op
all[lastDgst] = &op{Op: opNew}
}
fmt.Println(all, lastDgst)

Expand Down
Loading