2
0

CreateResource cannot overflow pool

This commit is contained in:
Jack Christensen
2023-07-06 21:18:31 -05:00
parent c5402ce536
commit 8101c0dff4
2 changed files with 51 additions and 16 deletions
+22 -16
View File
@@ -588,42 +588,48 @@ func (p *Pool[T]) AcquireAllIdle() []*Resource[T] {
return idle
}
// CreateResource constructs a new resource without acquiring it.
// It goes straight in the IdlePool. It does not check against maxSize.
// It can be useful to maintain warm resources under little load.
// CreateResource constructs a new resource without acquiring it. It goes straight in the IdlePool. If the pool is full
// it returns an error. It can be useful to maintain warm resources under little load.
func (p *Pool[T]) CreateResource(ctx context.Context) error {
if !p.acquireSem.TryAcquire(1) {
return ErrNotAvailable
}
p.mux.Lock()
if p.closed {
p.acquireSem.Release(1)
p.mux.Unlock()
return ErrClosedPool
}
p.destructWG.Add(1)
if len(p.allResources) >= int(p.maxSize) {
p.acquireSem.Release(1)
p.mux.Unlock()
return ErrNotAvailable
}
res := p.createNewResource()
p.mux.Unlock()
value, err := p.constructor(ctx)
p.mux.Lock()
defer p.mux.Unlock()
defer p.acquireSem.Release(1)
if err != nil {
p.allResources.remove(res)
p.destructWG.Done()
return err
}
res := &Resource[T]{
pool: p,
creationTime: time.Now(),
status: resourceStatusIdle,
value: value,
lastUsedNano: nanotime(),
poolResetCount: p.resetCount,
}
p.mux.Lock()
defer p.mux.Unlock()
res.value = value
res.status = resourceStatusIdle
// If closed while constructing resource then destroy it and return an error
if p.closed {
go p.destructResourceValue(res.value)
return ErrClosedPool
}
p.allResources.append(res)
p.idleResources.Push(res)
return nil
+29
View File
@@ -448,6 +448,28 @@ func TestPoolCreateResourceReturnsErrorWhenClosedWhileCreatingResource(t *testin
assert.Equal(t, puddle.ErrClosedPool, err)
}
func TestPoolCreateResourceReturnsErrorWhenPoolFull(t *testing.T) {
constructor, _ := createConstructor()
pool, err := puddle.NewPool(&puddle.Config[int]{Constructor: constructor, Destructor: stubDestructor, MaxSize: 2})
require.NoError(t, err)
defer pool.Close()
err = pool.CreateResource(context.Background())
require.NoError(t, err)
stats := pool.Stat()
assert.EqualValues(t, 1, stats.IdleResources())
err = pool.CreateResource(context.Background())
require.NoError(t, err)
stats = pool.Stat()
assert.EqualValues(t, 2, stats.IdleResources())
err = pool.CreateResource(context.Background())
require.Error(t, err)
}
func TestPoolCloseClosesAllIdleResources(t *testing.T) {
constructor, _ := createConstructor()
@@ -990,6 +1012,13 @@ func TestStress(t *testing.T) {
stat := pool.Stat()
assert.NotNil(t, stat)
},
// CreateResource
func() {
err := pool.CreateResource(context.Background())
if err != nil && !errors.Is(err, puddle.ErrClosedPool) && !errors.Is(err, puddle.ErrNotAvailable) {
t.Error(err)
}
},
}
workerCount := int(poolSize) * 2