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

get wrong parents bucket in withSnapshotBucket

Browse Source 
improve error message for CommitActive
Signed-off-by: yason <yan.xuean@zte.com.cn>
This commit is contained in:
yason 2017-12-02 22:10:11 +08:00
parent fe4e30cbb7
commit db742c90c0
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
snapshots/overlay/overlay.go
View File

@ -287,9 +287,9 @@ func (o *snapshotter) createSnapshot(ctx context.Context, kind snapshots.Kind, k
if err != nil { if err != nil {
return nil, err return nil, err
} }
isRollback := true rollback := true
defer func() { defer func() {
if isRollback { if rollback {
if rerr := t.Rollback(); rerr != nil { if rerr := t.Rollback(); rerr != nil {
log.G(ctx).WithError(rerr).Warn("failed to rollback transaction") log.G(ctx).WithError(rerr).Warn("failed to rollback transaction")
} }
@ -317,9 +317,9 @@ func (o *snapshotter) createSnapshot(ctx context.Context, kind snapshots.Kind, k
if err = os.Rename(td, path); err != nil { if err = os.Rename(td, path); err != nil {
return nil, errors.Wrap(err, "failed to rename") return nil, errors.Wrap(err, "failed to rename")
} }
isRollback = false
td = "" td = ""
rollback = false
if err = t.Commit(); err != nil { if err = t.Commit(); err != nil {
return nil, errors.Wrap(err, "commit failed") return nil, errors.Wrap(err, "commit failed")
} }

20
snapshots/storage/bolt.go
View File

@ -341,16 +341,16 @@ func CommitActive(ctx context.Context, key, name string, usage snapshots.Usage,
} }
sbkt := bkt.Bucket([]byte(key)) sbkt := bkt.Bucket([]byte(key))
if sbkt == nil { if sbkt == nil {
return errors.Wrap(errdefs.ErrNotFound, "failed to get active snapshot") return errors.Wrapf(errdefs.ErrNotFound, "failed to get active snapshot %q", key)
} }
var si snapshots.Info var si snapshots.Info
if err := readSnapshot(sbkt, &id, &si); err != nil { if err := readSnapshot(sbkt, &id, &si); err != nil {
return errors.Wrap(err, "failed to read snapshot") return errors.Wrapf(err, "failed to read active snapshot %q", key)
} }
if si.Kind != snapshots.KindActive { if si.Kind != snapshots.KindActive {
return errors.Wrapf(errdefs.ErrFailedPrecondition, "snapshot %v is not active", name) return errors.Wrapf(errdefs.ErrFailedPrecondition, "snapshot %q is not active", key)
} }
si.Kind = snapshots.KindCommitted si.Kind = snapshots.KindCommitted
si.Created = time.Now().UTC() si.Created = time.Now().UTC()
@ -366,18 +366,18 @@ func CommitActive(ctx context.Context, key, name string, usage snapshots.Usage,
return err return err
} }
if err := bkt.DeleteBucket([]byte(key)); err != nil { if err := bkt.DeleteBucket([]byte(key)); err != nil {
return errors.Wrap(err, "failed to delete active") return errors.Wrapf(err, "failed to delete active snapshot %q", key)
} }
if si.Parent != "" { if si.Parent != "" {
spbkt := bkt.Bucket([]byte(si.Parent)) spbkt := bkt.Bucket([]byte(si.Parent))
if spbkt == nil { if spbkt == nil {
return errors.Wrap(errdefs.ErrNotFound, "missing parent") return errors.Wrapf(errdefs.ErrNotFound, "missing parent snapshot of %q", key)
} }
pid := readID(spbkt) pid := readID(spbkt)
// Updates parent back link to use new key // Updates parent back link to use new key
if err := pbkt.Put(parentKey(pid, id), []byte(name)); err != nil { if err := pbkt.Put(parentKey(pid, id), []byte(name)); err != nil {
return errors.Wrap(err, "failed to update parent link") return errors.Wrapf(err, "failed to update parent link from %q to %q", key, name)
} }
} }
@ -394,11 +394,11 @@ func withSnapshotBucket(ctx context.Context, key string, fn func(context.Context
if !ok { if !ok {
return ErrNoTransaction return ErrNoTransaction
} }
bkt := tx.Bucket(bucketKeyStorageVersion) vbkt := tx.Bucket(bucketKeyStorageVersion)
if bkt == nil { if vbkt == nil {
return errors.Wrap(errdefs.ErrNotFound, "bucket does not exist") return errors.Wrap(errdefs.ErrNotFound, "bucket does not exist")
} }
bkt = bkt.Bucket(bucketKeySnapshot) bkt := vbkt.Bucket(bucketKeySnapshot)
if bkt == nil { if bkt == nil {
return errors.Wrap(errdefs.ErrNotFound, "snapshots bucket does not exist") return errors.Wrap(errdefs.ErrNotFound, "snapshots bucket does not exist")
} }
@ -407,7 +407,7 @@ func withSnapshotBucket(ctx context.Context, key string, fn func(context.Context
return errors.Wrap(errdefs.ErrNotFound, "snapshot does not exist") return errors.Wrap(errdefs.ErrNotFound, "snapshot does not exist")
} }
return fn(ctx, bkt, bkt.Bucket(bucketKeyParents)) return fn(ctx, bkt, vbkt.Bucket(bucketKeyParents))
} }
func withBucket(ctx context.Context, fn func(context.Context, *bolt.Bucket, *bolt.Bucket) error) error { func withBucket(ctx context.Context, fn func(context.Context, *bolt.Bucket, *bolt.Bucket) error) error {