Skip to content

[pull] main from containerd:main #110

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

Merged
pull merged 2 commits into from
Sep 20, 2025
Merged

[pull] main from containerd:main #110

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
635907e
Ensure errContentRangeIgnored error when range-get request is ignored…
henry118 Sep 9, 2025
cef8ce2
Merge pull request #12291 from henry118/fix-range-igore
AkihiroSuda Sep 19, 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
2 changes: 1 addition & 1 deletion core/remotes/docker/fetcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ func (r dockerFetcher) open(ctx context.Context, req *request, mediatype string,
if err := r.Acquire(ctx, 1); err != nil {
return nil, err
}
resp, err := req.doWithRetries(ctx, lastHost, withErrorCheck, withOffsetCheck(offset))
resp, err := req.doWithRetries(ctx, lastHost, withErrorCheck, withOffsetCheck(offset, parallelism))
switch err {
case nil:
// all good
Expand Down
1 change: 1 addition & 0 deletions core/remotes/docker/fetcher_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ func TestFetcherOpenParallel(t *testing.T) {
sendContentLength = true

ignoreContentRange = true
checkReader(0)
checkReader(25)
ignoreContentRange = false

Expand Down
4 changes: 2 additions & 2 deletions core/remotes/docker/resolver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,9 +659,9 @@ func withErrorCheck(r *request, resp *http.Response) error {

var errContentRangeIgnored = errors.New("content range requests ignored")

func withOffsetCheck(offset int64) doChecks {
func withOffsetCheck(offset, parallelism int64) doChecks {
return func(r *request, resp *http.Response) error {
if offset == 0 {
if parallelism <= 1 && offset == 0 {
return nil
}
if resp.StatusCode == http.StatusPartialContent {
Expand Down
Loading