Merge pull request #29281 from anusha-ragunathan/fix_race

Fix race in setting plugin refcounts.
This commit is contained in:
Anusha Ragunathan 2016-12-09 12:47:39 -08:00 committed by GitHub
commit 86a0de7fa9
2 changed files with 4 additions and 4 deletions

View file

@ -181,7 +181,7 @@ func (ps *Store) Get(name, capability string, mode int) (plugingetter.CompatPlug
}
p, err = ps.GetByName(fullName)
if err == nil {
p.SetRefCount(mode + p.GetRefCount())
p.AddRefCount(mode)
if p.IsEnabled() {
return p.FilterByCap(capability)
}

View file

@ -278,12 +278,12 @@ func (p *Plugin) GetRefCount() int {
return p.refCount
}
// SetRefCount sets the reference count.
func (p *Plugin) SetRefCount(count int) {
// AddRefCount adds to reference count.
func (p *Plugin) AddRefCount(count int) {
p.mu.Lock()
defer p.mu.Unlock()
p.refCount = count
p.refCount += count
}
// InitSpec creates an OCI spec from the plugin's config.