From 0759d8d0e58d1f47c7a2d988c343afa17966591c Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Mon, 18 Oct 2021 17:05:42 +0300 Subject: [PATCH] [#859] config: rename `small_size_limit` to `small_object_size` Signed-off-by: Evgenii Stratonikov --- cmd/neofs-node/config/engine/shard/blobstor/config.go | 4 ++-- cmd/neofs-node/config/engine/shard/writecache/config.go | 4 ++-- config/example/node.env | 8 ++++---- config/example/node.json | 8 ++++---- config/example/node.yaml | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cmd/neofs-node/config/engine/shard/blobstor/config.go b/cmd/neofs-node/config/engine/shard/blobstor/config.go index 86921952a5..c05563019e 100644 --- a/cmd/neofs-node/config/engine/shard/blobstor/config.go +++ b/cmd/neofs-node/config/engine/shard/blobstor/config.go @@ -88,13 +88,13 @@ func (x *Config) Compress() bool { ) } -// SmallSizeLimit returns value of "small_size_limit" config parameter. +// SmallSizeLimit returns value of "small_object_size" config parameter. // // Returns SmallSizeLimitDefault if value is not a positive number. func (x *Config) SmallSizeLimit() uint64 { l := config.SizeInBytesSafe( (*config.Config)(x), - "small_size_limit", + "small_object_size", ) if l > 0 { diff --git a/cmd/neofs-node/config/engine/shard/writecache/config.go b/cmd/neofs-node/config/engine/shard/writecache/config.go index ec65a5a619..4cf348a91e 100644 --- a/cmd/neofs-node/config/engine/shard/writecache/config.go +++ b/cmd/neofs-node/config/engine/shard/writecache/config.go @@ -63,13 +63,13 @@ func (x *Config) MemSize() uint64 { return MemSizeDefault } -// SmallObjectSize returns value of "small_size" config parameter. +// SmallObjectSize returns value of "small_object_size" config parameter. // // Returns SmallSizeDefault if value is not a positive number. func (x *Config) SmallObjectSize() uint64 { s := config.SizeInBytesSafe( (*config.Config)(x), - "small_size", + "small_object_size", ) if s > 0 { diff --git a/config/example/node.env b/config/example/node.env index c0b77f3770..6db62f5254 100644 --- a/config/example/node.env +++ b/config/example/node.env @@ -74,7 +74,7 @@ NEOFS_STORAGE_SHARD_0_RESYNC_METABASE=false NEOFS_STORAGE_SHARD_0_USE_WRITE_CACHE=false NEOFS_STORAGE_SHARD_0_WRITECACHE_PATH=tmp/0/cache NEOFS_STORAGE_SHARD_0_WRITECACHE_MEM_SIZE=2147483648 -NEOFS_STORAGE_SHARD_0_WRITECACHE_SMALL_SIZE=16384 +NEOFS_STORAGE_SHARD_0_WRITECACHE_SMALL_OBJECT_SIZE=16384 NEOFS_STORAGE_SHARD_0_WRITECACHE_MAX_SIZE=134217728 NEOFS_STORAGE_SHARD_0_WRITECACHE_WORKERS_NUMBER=30 NEOFS_STORAGE_SHARD_0_WRITECACHE_SIZE_LIMIT=3221225472 @@ -86,7 +86,7 @@ NEOFS_STORAGE_SHARD_0_BLOBSTOR_PATH=tmp/0/blob NEOFS_STORAGE_SHARD_0_BLOBSTOR_PERM=0644 NEOFS_STORAGE_SHARD_0_BLOBSTOR_COMPRESS=true NEOFS_STORAGE_SHARD_0_BLOBSTOR_SHALLOW_DEPTH=5 -NEOFS_STORAGE_SHARD_0_BLOBSTOR_SMALL_SIZE_LIMIT=102400 +NEOFS_STORAGE_SHARD_0_BLOBSTOR_SMALL_OBJECT_SIZE=102400 ### Blobovnicza config NEOFS_STORAGE_SHARD_0_BLOBSTOR_BLOBOVNICZA_SIZE=4194304 NEOFS_STORAGE_SHARD_0_BLOBSTOR_BLOBOVNICZA_SHALLOW_DEPTH=1 @@ -105,7 +105,7 @@ NEOFS_STORAGE_SHARD_1_RESYNC_METABASE=true NEOFS_STORAGE_SHARD_1_USE_WRITE_CACHE=true NEOFS_STORAGE_SHARD_1_WRITECACHE_PATH=tmp/1/cache NEOFS_STORAGE_SHARD_1_WRITECACHE_MEM_SIZE=2147483648 -NEOFS_STORAGE_SHARD_1_WRITECACHE_SMALL_SIZE=16384 +NEOFS_STORAGE_SHARD_1_WRITECACHE_SMALL_OBJECT_SIZE=16384 NEOFS_STORAGE_SHARD_1_WRITECACHE_MAX_SIZE=134217728 NEOFS_STORAGE_SHARD_1_WRITECACHE_WORKERS_NUMBER=30 NEOFS_STORAGE_SHARD_1_WRITECACHE_SIZE_LIMIT=4294967296 @@ -117,7 +117,7 @@ NEOFS_STORAGE_SHARD_1_BLOBSTOR_PATH=tmp/1/blob NEOFS_STORAGE_SHARD_1_BLOBSTOR_PERM=0644 NEOFS_STORAGE_SHARD_1_BLOBSTOR_COMPRESS=false NEOFS_STORAGE_SHARD_1_BLOBSTOR_SHALLOW_DEPTH=5 -NEOFS_STORAGE_SHARD_1_BLOBSTOR_SMALL_SIZE_LIMIT=102400 +NEOFS_STORAGE_SHARD_1_BLOBSTOR_SMALL_OBJECT_SIZE=102400 ### Blobovnicza config NEOFS_STORAGE_SHARD_1_BLOBSTOR_BLOBOVNICZA_SIZE=4194304 NEOFS_STORAGE_SHARD_1_BLOBSTOR_BLOBOVNICZA_SHALLOW_DEPTH=1 diff --git a/config/example/node.json b/config/example/node.json index a8b8380228..854bdd14b4 100644 --- a/config/example/node.json +++ b/config/example/node.json @@ -106,7 +106,7 @@ "writecache": { "path": "tmp/0/cache", "mem_size": 2147483648, - "small_size": 16384, + "small_object_size": 16384, "max_size": 134217728, "workers_number": 30, "size_limit": 3221225472 @@ -120,7 +120,7 @@ "perm": "0644", "compress": true, "shallow_depth": 5, - "small_size_limit": 102400, + "small_object_size": 102400, "blobovnicza": { "size": 4194304, "shallow_depth": 1, @@ -139,7 +139,7 @@ "writecache": { "path": "tmp/1/cache", "mem_size": 2147483648, - "small_size": 16384, + "small_object_size": 16384, "max_size": 134217728, "workers_number": 30, "size_limit": 4294967296 @@ -153,7 +153,7 @@ "perm": "0644", "compress": false, "shallow_depth": 5, - "small_size_limit": 102400, + "small_object_size": 102400, "blobovnicza": { "size": 4194304, "shallow_depth": 1, diff --git a/config/example/node.yaml b/config/example/node.yaml index 78cb23cb20..844b937ce8 100644 --- a/config/example/node.yaml +++ b/config/example/node.yaml @@ -94,7 +94,7 @@ storage: writecache: mem_size: 2147483648 # approximate RAM usage limit for "small" objects, bytes - small_size: 16384 # size threshold for "small" objects which are cached in key-value DB, not in FS, bytes + small_object_size: 16384 # size threshold for "small" objects which are cached in key-value DB, not in FS, bytes max_size: 134217728 # size threshold for "big" objects which bypass write-cache and go to the storage directly, bytes workers_number: 30 # number of write-cache flusher threads @@ -105,7 +105,7 @@ storage: compress: false # turn on/off zstd(level 3) compression of stored objects perm: 0644 # permissions for blobstor files(directories: +x for current user and group) shallow_depth: 5 # max depth of object tree storage in FS - small_size_limit: 102400 # size threshold for "small" objects which are cached in key-value DB, not in FS, bytes + small_object_size: 102400 # size threshold for "small" objects which are cached in key-value DB, not in FS, bytes blobovnicza: size: 4194304 # approximate size limit of single blobovnicza instance, total size will be: size*width^(depth+1), bytes