gopkg/puddle
2
0
Fork 0
Code Activity

Fix use waitgroup after close race

Browse Source
This commit is contained in:
Jack Christensen
2018-12-26 14:09:49 -06:00
parent 80b43a4df9
commit d83b67b4a8
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pool.go
+3 -6
View File
@@ -183,12 +183,14 @@ func (p *Pool) Acquire(ctx context.Context) (*Resource, error) {
if len(p.allResources) < p.maxSize { if len(p.allResources) < p.maxSize {
res := &Resource{pool: p, status: resourceStatusConstructing} res := &Resource{pool: p, status: resourceStatusConstructing}
p.allResources = append(p.allResources, res) p.allResources = append(p.allResources, res)
p.destructWG.Add(1)
p.cond.L.Unlock() p.cond.L.Unlock()
value, err := p.constructResourceValue(ctx) value, err := p.constructResourceValue(ctx)
p.cond.L.Lock() p.cond.L.Lock()
if err != nil { if err != nil {
p.allResources = removeResource(p.allResources, res) p.allResources = removeResource(p.allResources, res)
p.destructWG.Done()
p.cond.L.Unlock() p.cond.L.Unlock()
return nil, err return nil, err
} }
@@ -289,12 +291,7 @@ func removeResource(slice []*Resource, res *Resource) []*Resource {
} }
func (p *Pool) constructResourceValue(ctx context.Context) (interface{}, error) { func (p *Pool) constructResourceValue(ctx context.Context) (interface{}, error) {
value, err := p.constructor(ctx) return p.constructor(ctx)
if err != nil {
return nil, err
}
p.destructWG.Add(1)
return value, nil
} }
func (p *Pool) destructResourceValue(value interface{}) { func (p *Pool) destructResourceValue(value interface{}) {