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

Merge pull request #1765 from dmcgowan/rm-lease-resources

Browse Source 
Add support for removing leases on resource removal
This commit is contained in:
Stephen Day
2017-11-16 18:53:53 -08:00
committed by GitHub
parent 5c6e789dde f3a63f52dc
commit 9cb91f8bfa
3 changed files with 58 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
metadata/snapshot.go
View File

@@ -288,6 +288,10 @@ func (s *snapshotter) createSnapshot(ctx context.Context, key, parent string, re
}
return err
}
if err := addSnapshotLease(ctx, tx, s.name, key); err != nil {
return err
}
var bparent string
if parent != "" {
pbkt := bkt.Bucket([]byte(parent))
@@ -326,10 +330,6 @@ func (s *snapshotter) createSnapshot(ctx context.Context, key, parent string, re
return err
}
if err := addSnapshotLease(ctx, tx, s.name, key); err != nil {
return err
}
// TODO: Consider doing this outside of transaction to lessen
// metadata lock time
if readonly {
@@ -377,6 +377,9 @@ func (s *snapshotter) Commit(ctx context.Context, name, key string, opts ...snap
}
return err
}
if err := addSnapshotLease(ctx, tx, s.name, name); err != nil {
return err
}
obkt := bkt.Bucket([]byte(key))
if obkt == nil {
@@ -425,9 +428,13 @@ func (s *snapshotter) Commit(ctx context.Context, name, key string, opts ...snap
if err := boltutil.WriteLabels(bbkt, base.Labels); err != nil {
return err
}
if err := bkt.DeleteBucket([]byte(key)); err != nil {
return err
}
if err := removeSnapshotLease(ctx, tx, s.name, key); err != nil {
return err
}
// TODO: Consider doing this outside of transaction to lessen
// metadata lock time
@@ -479,6 +486,9 @@ func (s *snapshotter) Remove(ctx context.Context, key string) error {
if err := bkt.DeleteBucket([]byte(key)); err != nil {
return err
}
if err := removeSnapshotLease(ctx, tx, s.name, key); err != nil {
return err
}
// Mark snapshotter as dirty for triggering garbage collection
s.db.dirtyL.Lock()