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

Merge pull request #4724 from tonistiigi/pusher-error

Browse Source 
docker: don’t hide pusher response error
This commit is contained in:
Phil Estes 2020-11-11 09:39:50 -05:00 committed by GitHub
commit 1309384af0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
remotes/docker/pusher.go
View File

@ -222,7 +222,7 @@ func (p dockerPusher) Push(ctx context.Context, desc ocispec.Descriptor) (conten
// TODO: Support chunked upload // TODO: Support chunked upload
pr, pw := io.Pipe() pr, pw := io.Pipe()
respC := make(chan *http.Response, 1) respC := make(chan response, 1)
body := ioutil.NopCloser(pr) body := ioutil.NopCloser(pr)
req.body = func() (io.ReadCloser, error) { req.body = func() (io.ReadCloser, error) {
@ -240,6 +240,7 @@ func (p dockerPusher) Push(ctx context.Context, desc ocispec.Descriptor) (conten
defer close(respC) defer close(respC)
resp, err := req.do(ctx) resp, err := req.do(ctx)
if err != nil { if err != nil {
respC <- response{err: err}
pr.CloseWithError(err) pr.CloseWithError(err)
return return
} }
@ -251,7 +252,7 @@ func (p dockerPusher) Push(ctx context.Context, desc ocispec.Descriptor) (conten
log.G(ctx).WithField("resp", resp).WithField("body", string(err.(remoteserrors.ErrUnexpectedStatus).Body)).Debug("unexpected response") log.G(ctx).WithField("resp", resp).WithField("body", string(err.(remoteserrors.ErrUnexpectedStatus).Body)).Debug("unexpected response")
pr.CloseWithError(err) pr.CloseWithError(err)
} }
respC <- resp respC <- response{Response: resp}
}() }()
return &pushWriter{ return &pushWriter{
@ -284,12 +285,17 @@ func getManifestPath(object string, dgst digest.Digest) []string {
return []string{"manifests", object} return []string{"manifests", object}
} }
type response struct {
*http.Response
err error
}
type pushWriter struct { type pushWriter struct {
base *dockerBase base *dockerBase
ref string ref string
pipe *io.PipeWriter pipe *io.PipeWriter
responseC <-chan *http.Response responseC <-chan response
isManifest bool isManifest bool
expected digest.Digest expected digest.Digest
@ -339,8 +345,8 @@ func (pw *pushWriter) Commit(ctx context.Context, size int64, expected digest.Di
// TODO: timeout waiting for response // TODO: timeout waiting for response
resp := <-pw.responseC resp := <-pw.responseC
if resp == nil { if resp.err != nil {
return errors.New("no response") return resp.err
} }
// 201 is specified return status, some registries return // 201 is specified return status, some registries return