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

Clean up error messages

Browse Source 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
This commit is contained in:
Derek McGowan 2018-09-12 19:39:20 -07:00
parent a62be324b7
commit da6d29033c
No known key found for this signature in database
GPG Key ID: F58C5D0A4405ACDB
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
content/proxy/content_writer.go
View File

@ -57,7 +57,7 @@ func (rw *remoteWriter) Status() (content.Status, error) {
Action: contentapi.WriteActionStat, Action: contentapi.WriteActionStat,
}) })
if err != nil { if err != nil {
return content.Status{}, errors.Wrap(err, "error getting writer status") return content.Status{}, errors.Wrap(errdefs.FromGRPC(err), "error getting writer status")
} }
return content.Status{ return content.Status{
@ -82,7 +82,7 @@ func (rw *remoteWriter) Write(p []byte) (n int, err error) {
Data: p, Data: p,
}) })
if err != nil { if err != nil {
return 0, err return 0, errors.Wrap(errdefs.FromGRPC(err), "failed to send write")
} }
n = int(resp.Offset - offset) n = int(resp.Offset - offset)
@ -112,7 +112,7 @@ func (rw *remoteWriter) Commit(ctx context.Context, size int64, expected digest.
Labels: base.Labels, Labels: base.Labels,
}) })
if err != nil { if err != nil {
return errdefs.FromGRPC(err) return errors.Wrap(errdefs.FromGRPC(err), "commit failed")
} }
if size != 0 && resp.Offset != size { if size != 0 && resp.Offset != size {

3
export.go
View File

@ -22,6 +22,7 @@ import (
"github.com/containerd/containerd/images" "github.com/containerd/containerd/images"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/pkg/errors"
) )
type exportOpts struct { type exportOpts struct {
@ -51,7 +52,7 @@ func (c *Client) Export(ctx context.Context, exporter images.Exporter, desc ocis
} }
pr, pw := io.Pipe() pr, pw := io.Pipe()
go func() { go func() {
pw.CloseWithError(exporter.Export(ctx, c.ContentStore(), desc, pw)) pw.CloseWithError(errors.Wrap(exporter.Export(ctx, c.ContentStore(), desc, pw), "export failed"))
}() }()
return pr, nil return pr, nil
} }

4
images/oci/exporter.go
View File

@ -94,7 +94,7 @@ func blobRecord(cs content.Provider, desc ocispec.Descriptor) tarRecord {
CopyTo: func(ctx context.Context, w io.Writer) (int64, error) { CopyTo: func(ctx context.Context, w io.Writer) (int64, error) {
r, err := cs.ReaderAt(ctx, desc) r, err := cs.ReaderAt(ctx, desc)
if err != nil { if err != nil {
return 0, err return 0, errors.Wrap(err, "failed to get reader")
} }
defer r.Close() defer r.Close()
@ -103,7 +103,7 @@ func blobRecord(cs content.Provider, desc ocispec.Descriptor) tarRecord {
n, err := io.Copy(io.MultiWriter(w, dgstr.Hash()), content.NewReader(r)) n, err := io.Copy(io.MultiWriter(w, dgstr.Hash()), content.NewReader(r))
if err != nil { if err != nil {
return 0, err return 0, errors.Wrap(err, "failed to copy to tar")
} }
if dgstr.Digest() != desc.Digest { if dgstr.Digest() != desc.Digest {
return 0, errors.Errorf("unexpected digest %s copied", dgstr.Digest()) return 0, errors.Errorf("unexpected digest %s copied", dgstr.Digest())