Skip to content

Conversation

@dmcgowan
Copy link
Member

Adds unpack to transfer service.

See https://asciinema.org/a/6bJRKKKuqkAVV51GjN8SBSeYu

A few notes...

  • we could order the progress lines better to make it easier to follow
  • remote differ will not have the progress but the proxy will at least send start and end progress

@github-project-automation github-project-automation bot moved this to Needs Triage in Pull Request Review May 30, 2025
@dmcgowan dmcgowan changed the title Unpack progress Tar unpack progress May 30, 2025
@dosubot dosubot bot added the area/distribution Image Distribution label May 30, 2025
@dmcgowan dmcgowan changed the title Tar unpack progress Tar unpack progress through transfer service May 30, 2025
"github.com/containerd/platforms"
"github.com/opencontainers/image-spec/identity"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/urfave/cli/v2"
Copy link
Member

Choose a reason for hiding this comment

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

This linter changes should be probably a separate PR?

roots = []*progressNode{}
progress transfer.ProgressFunc
pc = make(chan transfer.Progress, 1)
pc = make(chan transfer.Progress, 5)
Copy link
Member

Choose a reason for hiding this comment

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

This number seems to need an explanation

Copy link
Member Author

Choose a reason for hiding this comment

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

Added, although this is still kind of a bandaid solution. Right now the progress drain is a bit racy and we could probably add a better solution, especially if we could just rely on some indicator in the progress stream that the end has been reached (with a timeout accounting for it not being reached).

@dmcgowan dmcgowan added this to the 2.2 milestone Jun 3, 2025
@AkihiroSuda
Copy link
Member

Probably this should be rebased to run the tests with the latest main

return pr.c.Close()
}

type closeReader struct {
Copy link
Member

Choose a reason for hiding this comment

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

nit: should we call it readCloser to more align with go's ReadCloser?

@github-project-automation github-project-automation bot moved this from Needs Triage to Review In Progress in Pull Request Review Sep 10, 2025
Allows the apply process to return progress on the tar apply operation.

Signed-off-by: Derek McGowan <[email protected]>
@AkihiroSuda AkihiroSuda added this pull request to the merge queue Sep 17, 2025
Merged via the queue into containerd:main with commit 6fcb822 Sep 17, 2025
95 of 96 checks passed
@github-project-automation github-project-automation bot moved this from Review In Progress to Done in Pull Request Review Sep 17, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

4 participants