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

Remove unneeded Finalize method from ImmutableRef. #2216

Merged
merged 1 commit into from
Jul 1, 2021
Merged

Remove unneeded Finalize method from ImmutableRef. #2216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions cache/blobs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func (sr *immutableRef) computeBlobChain(ctx context.Context, createIfNeeded boo
return errors.Errorf("missing lease requirement for computeBlobChain")
}

if err := sr.Finalize(ctx, true); err != nil {
if err := sr.finalizeLocked(ctx); err != nil {
return err
}

Expand Down Expand Up @@ -174,7 +174,7 @@ func (sr *immutableRef) setBlob(ctx context.Context, desc ocispec.Descriptor) er
return nil
}

if err := sr.finalize(ctx, true); err != nil {
if err := sr.finalize(ctx); err != nil {
return err
}

Expand Down
8 changes: 4 additions & 4 deletions cache/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,11 @@ func (cm *cacheManager) GetByBlob(ctx context.Context, desc ocispec.Descriptor,
if err != nil {
return nil, err
}
if err := p2.Finalize(ctx, true); err != nil {
p = p2.(*immutableRef)
if err := p.finalizeLocked(ctx); err != nil {
return nil, err
}
parentID = p2.ID()
p = p2.(*immutableRef)
parentID = p.ID()
}

releaseParent := false
Expand Down Expand Up @@ -475,7 +475,7 @@ func (cm *cacheManager) New(ctx context.Context, s ImmutableRef, sess session.Gr
}
parent = p.(*immutableRef)
}
if err := parent.Finalize(ctx, true); err != nil {
if err := parent.finalizeLocked(ctx); err != nil {
return nil, err
}
if err := parent.Extract(ctx, sess); err != nil {
Expand Down
6 changes: 3 additions & 3 deletions cache/manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ func TestManager(t *testing.T) {

checkDiskUsage(ctx, t, cm, 1, 0)

err = snap.Finalize(ctx, true)
err = snap.(*immutableRef).finalizeLocked(ctx)
require.NoError(t, err)

err = snap.Release(ctx)
Expand Down Expand Up @@ -867,7 +867,7 @@ func TestLazyCommit(t *testing.T) {
require.NoError(t, err)

// this time finalize commit
err = snap.Finalize(ctx, true)
err = snap.(*immutableRef).finalizeLocked(ctx)
require.NoError(t, err)

err = snap.Release(ctx)
Expand Down Expand Up @@ -941,7 +941,7 @@ func TestLazyCommit(t *testing.T) {
snap2, err = cm.Get(ctx, snap.ID())
require.NoError(t, err)

err = snap2.Finalize(ctx, true)
err = snap2.(*immutableRef).finalizeLocked(ctx)
require.NoError(t, err)

err = snap2.Release(ctx)
Expand Down
18 changes: 5 additions & 13 deletions cache/refs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ type Ref interface {
type ImmutableRef interface {
Ref
Parent() ImmutableRef
Finalize(ctx context.Context, commit bool) error // Make sure reference is flushed to driver
Clone() ImmutableRef

Info() RefInfo
Expand Down Expand Up @@ -255,7 +254,7 @@ func (cr *cacheRecord) mount(ctx context.Context, readonly bool) (snapshot.Mount
return setReadonly(m), nil
}

if err := cr.finalize(ctx, true); err != nil {
if err := cr.finalize(ctx); err != nil {
return nil, err
}
if cr.viewMount == nil { // TODO: handle this better
Expand Down Expand Up @@ -717,29 +716,22 @@ func (sr *immutableRef) release(ctx context.Context) error {
return nil
}

func (sr *immutableRef) Finalize(ctx context.Context, b bool) error {
func (sr *immutableRef) finalizeLocked(ctx context.Context) error {
sr.mu.Lock()
defer sr.mu.Unlock()

return sr.finalize(ctx, b)
return sr.finalize(ctx)
}

func (cr *cacheRecord) Metadata() *metadata.StorageItem {
return cr.md
}

func (cr *cacheRecord) finalize(ctx context.Context, commit bool) error {
// caller must hold cacheRecord.mu
func (cr *cacheRecord) finalize(ctx context.Context) error {
mutable := cr.equalMutable
if mutable == nil {
return nil
}
if !commit {
if HasCachePolicyRetain(mutable) {
CachePolicyRetain(mutable)
return mutable.Metadata().Commit()
}
return nil
}

_, err := cr.cm.ManagerOpt.LeaseManager.Create(ctx, func(l *leases.Lease) error {
l.ID = cr.ID()
Expand Down
11 changes: 1 addition & 10 deletions solver/llbsolver/bridge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,16 +105,7 @@ func (b *llbBridge) loadResult(ctx context.Context, def *pb.Definition, cacheImp
if err != nil {
return nil, err
}
wr, ok := res.Sys().(*worker.WorkerRef)
if !ok {
return nil, errors.Errorf("invalid reference for exporting: %T", res.Sys())
}
if wr.ImmutableRef != nil {
if err := wr.ImmutableRef.Finalize(ctx, false); err != nil {
return nil, err
}
}
return res, err
return res, nil
}

func (b *llbBridge) Solve(ctx context.Context, req frontend.SolveRequest, sid string) (res *frontend.Result, err error) {
Expand Down