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

Merge pull request #1852 from yanxuean/error-log

Browse Source 
improve error message
This commit is contained in:
Phil Estes 2017-12-01 10:07:54 -05:00 committed by GitHub
commit 16a2177ae3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
metadata/snapshot.go
View File

@ -359,7 +359,8 @@ func (s *snapshotter) Commit(ctx context.Context, name, key string, opts ...snap
return update(ctx, s.db, func(tx *bolt.Tx) error { return update(ctx, s.db, func(tx *bolt.Tx) error {
bkt := getSnapshotterBucket(tx, ns, s.name) bkt := getSnapshotterBucket(tx, ns, s.name)
if bkt == nil { if bkt == nil {
return errors.Wrapf(errdefs.ErrNotFound, "snapshot %v does not exist", key) return errors.Wrapf(errdefs.ErrNotFound,
"can not find snapshotter %q", s.name)
} }
bbkt, err := bkt.CreateBucket([]byte(name)) bbkt, err := bkt.CreateBucket([]byte(name))

8
rootfs/apply.go
View File

@ -55,10 +55,10 @@ func ApplyLayer(ctx context.Context, layer Layer, chain []digest.Digest, sn snap
_, err := sn.Stat(ctx, chainID.String()) _, err := sn.Stat(ctx, chainID.String())
if err == nil { if err == nil {
log.G(ctx).Debugf("Extraction not needed, layer snapshot exists") log.G(ctx).Debugf("Extraction not needed, layer snapshot %s exists", chainID)
return false, nil return false, nil
} else if !errdefs.IsNotFound(err) { } else if !errdefs.IsNotFound(err) {
return false, errors.Wrap(err, "failed to stat snapshot") return false, errors.Wrapf(err, "failed to stat snapshot %s", chainID)
} }
key := fmt.Sprintf("extract-%s %s", uniquePart(), chainID) key := fmt.Sprintf("extract-%s %s", uniquePart(), chainID)
@ -67,7 +67,7 @@ func ApplyLayer(ctx context.Context, layer Layer, chain []digest.Digest, sn snap
mounts, err := sn.Prepare(ctx, key, parent.String(), opts...) mounts, err := sn.Prepare(ctx, key, parent.String(), opts...)
if err != nil { if err != nil {
//TODO: If is snapshot exists error, retry //TODO: If is snapshot exists error, retry
return false, errors.Wrap(err, "failed to prepare extraction layer") return false, errors.Wrapf(err, "failed to prepare extraction snapshot %q", key)
} }
defer func() { defer func() {
if err != nil { if err != nil {
@ -89,7 +89,7 @@ func ApplyLayer(ctx context.Context, layer Layer, chain []digest.Digest, sn snap
if err = sn.Commit(ctx, chainID.String(), key, opts...); err != nil { if err = sn.Commit(ctx, chainID.String(), key, opts...); err != nil {
if !errdefs.IsAlreadyExists(err) { if !errdefs.IsAlreadyExists(err) {
return false, errors.Wrapf(err, "failed to commit snapshot %s", parent) return false, errors.Wrapf(err, "failed to commit snapshot %s", key)
} }
// Destination already exists, cleanup key and return without error // Destination already exists, cleanup key and return without error