writecache: change size estimations

Now size of write-cache is a sum of every object currently stored in WS.

Closes #3101.

Signed-off-by: Andrey Butusov <[email protected]>

Author: End-rey

CHANGELOG.md

@@ -21,6 +21,7 @@ Changelog for NeoFS Node
 
 ### Changed
 - Number of cuncurrenly handled notifications from the chain was increased from 10 to 300 for IR (#3068)
+- Write-cache size estimations (#3106)
 
 ### Removed
 - Drop creating new eacl tables with public keys (#3096)

pkg/local_object_storage/writecache/delete.go

@@ -24,7 +24,7 @@ func (c *cache) Delete(addr oid.Address) error {
 			storagelog.StorageTypeField(wcStorageType),
 			storagelog.OpField("DELETE"),
 		)
-		c.objCounters.DecFS()
+		c.objCounters.Delete(addr)
 	}
 
 	return err

pkg/local_object_storage/writecache/options.go

@@ -38,7 +38,7 @@ type options struct {
 	// maxCacheSize is the maximum total size of all objects saved in cache.
 	// 1 GiB by default.
 	maxCacheSize uint64
-	// objCounters contains atomic counters for the number of objects stored in cache.
+	// objCounters contains object list along with sizes and overall size of cache.
 	objCounters counters
 	// noSync is true iff FSTree allows unsynchronized writes.
 	noSync bool

pkg/local_object_storage/writecache/put.go

@@ -39,8 +39,9 @@ func (c *cache) Put(addr oid.Address, obj *objectSDK.Object, data []byte) error
 
 // put writes object to FSTree and pushes it to the flush workers queue.
 func (c *cache) put(addr oid.Address, obj objectInfo) error {
-	cacheSz := c.estimateCacheSize()
-	if c.maxCacheSize < c.incSizeFS(cacheSz) {
+	cacheSz := c.objCounters.Size()
+	objSz := obj.obj.PayloadSize()
+	if c.maxCacheSize < cacheSz+objSz {
 		return ErrOutOfSpace
 	}
 
@@ -54,7 +55,7 @@ func (c *cache) put(addr oid.Address, obj objectInfo) error {
 		c.compressFlags[obj.addr] = struct{}{}
 		c.mtx.Unlock()
 	}
-	c.objCounters.IncFS()
+	c.objCounters.Add(addr, objSz)
 	storagelog.Write(c.log,
 		storagelog.AddressField(obj.addr),
 		storagelog.StorageTypeField(wcStorageType),

pkg/local_object_storage/writecache/state.go

@@ -2,41 +2,51 @@ package writecache
 
 import (
 	"fmt"
-	"math"
-	"sync/atomic"
+	"sync"
+
+	oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
 )
 
-func (c *cache) estimateCacheSize() uint64 {
-	return c.objCounters.FS() * c.maxObjectSize
+type counters struct {
+	mu     sync.Mutex
+	objMap map[oid.Address]uint64
+	size   uint64
 }
 
-func (c *cache) incSizeFS(sz uint64) uint64 {
-	return sz + c.maxObjectSize
-}
+func (x *counters) Add(addr oid.Address, size uint64) {
+	x.mu.Lock()
+	defer x.mu.Unlock()
 
-type counters struct {
-	cFS atomic.Uint64
+	x.size += size
+	x.objMap[addr] = size
 }
 
-func (x *counters) IncFS() {
-	x.cFS.Add(1)
-}
+func (x *counters) Delete(addr oid.Address) {
+	x.mu.Lock()
+	defer x.mu.Unlock()
 
-func (x *counters) DecFS() {
-	x.cFS.Add(math.MaxUint32)
+	x.size -= x.objMap[addr]
+	delete(x.objMap, addr)
 }
 
-func (x *counters) FS() uint64 {
-	return x.cFS.Load()
+func (x *counters) Size() uint64 {
+	x.mu.Lock()
+	defer x.mu.Unlock()
+	return x.size
 }
 
 func (c *cache) initCounters() error {
-	inFS, err := c.fsTree.NumberOfObjects()
+	var objHandler = func(addr oid.Address, data []byte, _ []byte) error {
+		c.objCounters.Add(addr, uint64(len(data)))
+		return nil
+	}
+
+	var errorHandler = func(oid.Address, error) error { return nil }
+
+	err := c.fsTree.Iterate(objHandler, errorHandler)
 	if err != nil {
 		return fmt.Errorf("could not read write-cache FS counter: %w", err)
 	}
 
-	c.objCounters.cFS.Store(inFS)
-
 	return nil
 }

pkg/local_object_storage/writecache/storage.go

@@ -97,7 +97,7 @@ func (c *cache) deleteFromDisk(keys []string) []string {
 				storagelog.StorageTypeField(wcStorageType),
 				storagelog.OpField("DELETE"),
 			)
-			c.objCounters.DecFS()
+			c.objCounters.Delete(addr)
 		}
 	}
 

pkg/local_object_storage/writecache/writecache.go

@@ -101,6 +101,9 @@ func New(opts ...Option) Cache {
 			log:           zap.NewNop(),
 			maxObjectSize: defaultMaxObjectSize,
 			maxCacheSize:  defaultMaxCacheSize,
+			objCounters: counters{
+				objMap: make(map[oid.Address]uint64),
+			},
 		},
 	}