[#114] pool: Don't use part buffers when client cut is off
Signed-off-by: Denis Kirillov <d.kirillov@yadro.com>
This commit is contained in:
parent
2bdbfdb23e
commit
44ae28d1df
2 changed files with 18 additions and 17 deletions
|
@ -58,9 +58,8 @@ func (p *PartsBufferPool) FreeBuffer(buff *PartBuffer) error {
|
|||
p.mu.Lock()
|
||||
defer p.mu.Unlock()
|
||||
|
||||
used := p.limit - p.available
|
||||
if buff.len > used {
|
||||
return fmt.Errorf("buffer size %d to free is greater than used: %d", buff.len, used)
|
||||
if buff.len+p.available > p.limit {
|
||||
return fmt.Errorf("buffer size %d to free is too large, available: %d, limit: %d", buff.len, p.available, p.limit)
|
||||
}
|
||||
|
||||
p.available += buff.len
|
||||
|
|
30
pool/pool.go
30
pool/pool.go
|
@ -2250,24 +2250,26 @@ func (p *Pool) PutObject(ctx context.Context, prm PrmObjectPut) (oid.ID, error)
|
|||
}
|
||||
}
|
||||
|
||||
buff, err := p.partsBufferPool.GetBuffer()
|
||||
if err != nil {
|
||||
return oid.ID{}, fmt.Errorf("cannot get buffer for put operations: %w", err)
|
||||
}
|
||||
|
||||
defer func() {
|
||||
if errFree := p.partsBufferPool.FreeBuffer(buff); errFree != nil {
|
||||
p.log(zap.WarnLevel, "failed to free part buffer", zap.Error(err))
|
||||
if prm.clientCut {
|
||||
buff, err := p.partsBufferPool.GetBuffer()
|
||||
if err != nil {
|
||||
return oid.ID{}, fmt.Errorf("cannot get buffer for put operations: %w", err)
|
||||
}
|
||||
}()
|
||||
|
||||
prm.setPartBuffer(buff.Buffer)
|
||||
prm.setPartBuffer(buff.Buffer)
|
||||
|
||||
var ni netmap.NetworkInfo
|
||||
ni.SetCurrentEpoch(p.cache.Epoch())
|
||||
ni.SetMaxObjectSize(p.partsBufferPool.ParBufferSize()) // we want to use initial max object size in PayloadSizeLimiter
|
||||
var ni netmap.NetworkInfo
|
||||
ni.SetCurrentEpoch(p.cache.Epoch())
|
||||
ni.SetMaxObjectSize(p.partsBufferPool.ParBufferSize()) // we want to use initial max object size in PayloadSizeLimiter
|
||||
|
||||
prm.setNetworkInfo(ni)
|
||||
prm.setNetworkInfo(ni)
|
||||
|
||||
defer func() {
|
||||
if errFree := p.partsBufferPool.FreeBuffer(buff); errFree != nil {
|
||||
p.log(zap.WarnLevel, "failed to free part buffer", zap.Error(err))
|
||||
}
|
||||
}()
|
||||
}
|
||||
|
||||
id, err := ctxCall.client.objectPut(ctx, prm)
|
||||
if err != nil {
|
||||
|
|
Loading…
Reference in a new issue