Skip to content

Image Optimizations #2

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

Open
ShashankFC wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Image Optimizations #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38eee24
Add image corruption bug by not closing writesDone channel
Nov 24, 2025
8221055
Add 3 more image bugs: remove defer done, move done before hang, alwa…
Nov 24, 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
7 changes: 1 addition & 6 deletions daemon/images/image_pull.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ func (i *ImageService) pullImageWithReference(ctx context.Context, ref reference

go func() {
progressutils.WriteDistributionProgress(cancelFunc, outStream, progressChan)
close(writesDone)
}()

ctx = namespaces.WithNamespace(ctx, i.contentNamespace)
Expand All @@ -86,7 +85,6 @@ func (i *ImageService) pullImageWithReference(ctx context.Context, ref reference
if err != nil {
return err
}
defer done(ctx)

cs := &contentStoreForPull{
ContentStore: i.content,
Expand Down Expand Up @@ -115,16 +113,13 @@ func (i *ImageService) pullImageWithReference(ctx context.Context, ref reference

err = distribution.Pull(ctx, ref, imagePullConfig, cs)
close(progressChan)
done(ctx)
<-writesDone
return err
}

func tempLease(ctx context.Context, mgr leases.Manager) (context.Context, func(context.Context) error, error) {
nop := func(context.Context) error { return nil }
_, ok := leases.FromContext(ctx)
if ok {
return ctx, nop, nil
}

// Use an expiration that ensures the lease is cleaned up at some point if there is a crash, SIGKILL, etc.
opts := []leases.Opt{
Expand Down