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

Use single instance of snapshot and content stores

Browse Source 
Ensures that all callers and the garbage collector are using
the same lock instances to prevent cleanup of objects
during creation.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
This commit is contained in:
Derek McGowan 2017-10-16 11:57:50 -07:00
parent e378196505
commit 295cce278f
No known key found for this signature in database
GPG Key ID: F58C5D0A4405ACDB
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
metadata/db.go
View File

@ -37,8 +37,8 @@ const (
// datastores for content and snapshots. // datastores for content and snapshots.
type DB struct { type DB struct {
db *bolt.DB db *bolt.DB
ss map[string]snapshot.Snapshotter ss map[string]*snapshotter
cs content.Store cs *contentStore
// wlock is used to protect access to the data structures during garbage // wlock is used to protect access to the data structures during garbage
// collection. While the wlock is held no writable transactions can be // collection. While the wlock is held no writable transactions can be
@ -60,12 +60,19 @@ type DB struct {
// NewDB creates a new metadata database using the provided // NewDB creates a new metadata database using the provided
// bolt database, content store, and snapshotters. // bolt database, content store, and snapshotters.
func NewDB(db *bolt.DB, cs content.Store, ss map[string]snapshot.Snapshotter) *DB { func NewDB(db *bolt.DB, cs content.Store, ss map[string]snapshot.Snapshotter) *DB {
return &DB{ m := &DB{
db: db, db: db,
ss: ss, ss: make(map[string]*snapshotter, len(ss)),
cs: cs,
dirtySS: map[string]struct{}{}, dirtySS: map[string]struct{}{},
} }
// Initialize data stores
m.cs = newContentStore(m, cs)
for name, sn := range ss {
m.ss[name] = newSnapshotter(m, name, sn)
}
return m
} }
// Init ensures the database is at the correct version // Init ensures the database is at the correct version
@ -158,7 +165,7 @@ func (m *DB) ContentStore() content.Store {
if m.cs == nil { if m.cs == nil {
return nil return nil
} }
return newContentStore(m, m.cs) return m.cs
} }
// Snapshotter returns a namespaced content store for // Snapshotter returns a namespaced content store for
@ -168,7 +175,7 @@ func (m *DB) Snapshotter(name string) snapshot.Snapshotter {
if !ok { if !ok {
return nil return nil
} }
return newSnapshotter(m, name, sn) return sn
} }
// View runs a readonly transaction on the metadata store. // View runs a readonly transaction on the metadata store.
@ -292,7 +299,7 @@ func (m *DB) cleanupSnapshotter(name string) {
return return
} }
err := newSnapshotter(m, name, sn).garbageCollect(ctx) err := sn.garbageCollect(ctx)
if err != nil { if err != nil {
log.G(ctx).WithError(err).WithField("snapshotter", name).Warn("garbage collection failed") log.G(ctx).WithError(err).WithField("snapshotter", name).Warn("garbage collection failed")
} }