github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #6617 from FabHof/main

Browse Source 
Improve unexpected response error handling in resolver
This commit is contained in:
Phil Estes 2022-03-08 13:28:50 -05:00 committed by GitHub
commit 4fbdb40236
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
remotes/docker/resolver.go
View File

@ -32,6 +32,7 @@ import (
"github.com/containerd/containerd/reference" "github.com/containerd/containerd/reference"
"github.com/containerd/containerd/remotes" "github.com/containerd/containerd/remotes"
"github.com/containerd/containerd/remotes/docker/schema1" "github.com/containerd/containerd/remotes/docker/schema1"
remoteerrors "github.com/containerd/containerd/remotes/errors"
"github.com/containerd/containerd/version" "github.com/containerd/containerd/version"
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
@ -297,11 +298,11 @@ func (r *dockerResolver) Resolve(ctx context.Context, ref string) (string, ocisp
if resp.StatusCode > 399 { if resp.StatusCode > 399 {
// Set firstErr when encountering the first non-404 status code. // Set firstErr when encountering the first non-404 status code.
if firstErr == nil { if firstErr == nil {
firstErr = fmt.Errorf("pulling from host %s failed with status code %v: %v", host.Host, u, resp.Status) firstErr = remoteerrors.NewUnexpectedStatusErr(resp)
} }
continue // try another host continue // try another host
} }
return "", ocispec.Descriptor{}, fmt.Errorf("pulling from host %s failed with unexpected status code %v: %v", host.Host, u, resp.Status) return "", ocispec.Descriptor{}, remoteerrors.NewUnexpectedStatusErr(resp)
} }
size := resp.ContentLength size := resp.ContentLength
contentType := getManifestMediaType(resp) contentType := getManifestMediaType(resp)

2
remotes/errors/errors.go
View File

@ -33,7 +33,7 @@ type ErrUnexpectedStatus struct {
} }
func (e ErrUnexpectedStatus) Error() string { func (e ErrUnexpectedStatus) Error() string {
return fmt.Sprintf("unexpected status: %s", e.Status) return fmt.Sprintf("unexpected status from %s request to %s: %s", e.RequestMethod, e.RequestURL, e.Status)
} }
// NewUnexpectedStatusErr creates an ErrUnexpectedStatus from HTTP response // NewUnexpectedStatusErr creates an ErrUnexpectedStatus from HTTP response