fyrchik/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#1668] writecache: Use object size to check free space

Browse source 
Signed-off-by: Dmitrii Stepanov <d.stepanov@yadro.com>
This commit is contained in:
Dmitrii Stepanov 2025-03-10 17:51:06 +03:00
parent bd61f7bf0a
commit 8643e0abc5
Signed by: dstepanov-yadro
GPG key ID: 237AF1A763293BC0
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkg/local_object_storage/writecache/put.go
View file

@ -2,6 +2,7 @@ package writecache
import (
"context"
"fmt"
"time"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common"
@ -59,7 +60,15 @@ func (c *cache) Put(ctx context.Context, prm common.PutPrm) (common.PutRes, erro
// putBig writes object to FSTree and pushes it to the flush workers queue.
func (c *cache) putBig(ctx context.Context, prm common.PutPrm) error {
if !c.hasEnoughSpaceFS() {
if prm.RawData == nil { // foolproof: RawData should be marshalled by shard.
data, err := prm.Object.Marshal()
if err != nil {
return fmt.Errorf("cannot marshal object: %w", err)
}
prm.RawData = data
}
size := uint64(len(prm.RawData))
if !c.hasEnoughSpace(size) {
return ErrOutOfSpace
}

4
pkg/local_object_storage/writecache/state.go
View file

@ -7,10 +7,6 @@ func (c *cache) estimateCacheSize() (uint64, uint64) {
return count, size
}
func (c *cache) hasEnoughSpaceFS() bool {
return c.hasEnoughSpace(c.maxObjectSize)
}
func (c *cache) hasEnoughSpace(objectSize uint64) bool {
count, size := c.estimateCacheSize()
if c.maxCacheCount > 0 && count+1 > c.maxCacheCount {