okonstantinova/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Pull requests Activity

[#859] config: rename small_size_limit to small_object_size

Browse source 
Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
This commit is contained in:
Evgenii Stratonikov 2021-10-18 17:05:42 +03:00 committed by Alex Vanin
parent cbf8ca12b0
commit 0759d8d0e5
5 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmd/neofs-node/config/engine/shard/blobstor/config.go
View file

@ -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. // Returns SmallSizeLimitDefault if value is not a positive number.
func (x *Config) SmallSizeLimit() uint64 { func (x *Config) SmallSizeLimit() uint64 {
l := config.SizeInBytesSafe( l := config.SizeInBytesSafe(
(*config.Config)(x), (*config.Config)(x),
"small_size_limit", "small_object_size",
) )
if l > 0 { if l > 0 {

4
cmd/neofs-node/config/engine/shard/writecache/config.go
View file

@ -63,13 +63,13 @@ func (x *Config) MemSize() uint64 {
return MemSizeDefault 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. // Returns SmallSizeDefault if value is not a positive number.
func (x *Config) SmallObjectSize() uint64 { func (x *Config) SmallObjectSize() uint64 {
s := config.SizeInBytesSafe( s := config.SizeInBytesSafe(
(*config.Config)(x), (*config.Config)(x),
"small_size", "small_object_size",
) )
if s > 0 { if s > 0 {

8
config/example/node.env
View file

@ -74,7 +74,7 @@ NEOFS_STORAGE_SHARD_0_RESYNC_METABASE=false
NEOFS_STORAGE_SHARD_0_USE_WRITE_CACHE=false NEOFS_STORAGE_SHARD_0_USE_WRITE_CACHE=false
NEOFS_STORAGE_SHARD_0_WRITECACHE_PATH=tmp/0/cache NEOFS_STORAGE_SHARD_0_WRITECACHE_PATH=tmp/0/cache
NEOFS_STORAGE_SHARD_0_WRITECACHE_MEM_SIZE=2147483648 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_MAX_SIZE=134217728
NEOFS_STORAGE_SHARD_0_WRITECACHE_WORKERS_NUMBER=30 NEOFS_STORAGE_SHARD_0_WRITECACHE_WORKERS_NUMBER=30
NEOFS_STORAGE_SHARD_0_WRITECACHE_SIZE_LIMIT=3221225472 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_PERM=0644
NEOFS_STORAGE_SHARD_0_BLOBSTOR_COMPRESS=true NEOFS_STORAGE_SHARD_0_BLOBSTOR_COMPRESS=true
NEOFS_STORAGE_SHARD_0_BLOBSTOR_SHALLOW_DEPTH=5 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 ### Blobovnicza config
NEOFS_STORAGE_SHARD_0_BLOBSTOR_BLOBOVNICZA_SIZE=4194304 NEOFS_STORAGE_SHARD_0_BLOBSTOR_BLOBOVNICZA_SIZE=4194304
NEOFS_STORAGE_SHARD_0_BLOBSTOR_BLOBOVNICZA_SHALLOW_DEPTH=1 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_USE_WRITE_CACHE=true
NEOFS_STORAGE_SHARD_1_WRITECACHE_PATH=tmp/1/cache NEOFS_STORAGE_SHARD_1_WRITECACHE_PATH=tmp/1/cache
NEOFS_STORAGE_SHARD_1_WRITECACHE_MEM_SIZE=2147483648 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_MAX_SIZE=134217728
NEOFS_STORAGE_SHARD_1_WRITECACHE_WORKERS_NUMBER=30 NEOFS_STORAGE_SHARD_1_WRITECACHE_WORKERS_NUMBER=30
NEOFS_STORAGE_SHARD_1_WRITECACHE_SIZE_LIMIT=4294967296 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_PERM=0644
NEOFS_STORAGE_SHARD_1_BLOBSTOR_COMPRESS=false NEOFS_STORAGE_SHARD_1_BLOBSTOR_COMPRESS=false
NEOFS_STORAGE_SHARD_1_BLOBSTOR_SHALLOW_DEPTH=5 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 ### Blobovnicza config
NEOFS_STORAGE_SHARD_1_BLOBSTOR_BLOBOVNICZA_SIZE=4194304 NEOFS_STORAGE_SHARD_1_BLOBSTOR_BLOBOVNICZA_SIZE=4194304
NEOFS_STORAGE_SHARD_1_BLOBSTOR_BLOBOVNICZA_SHALLOW_DEPTH=1 NEOFS_STORAGE_SHARD_1_BLOBSTOR_BLOBOVNICZA_SHALLOW_DEPTH=1

8
config/example/node.json
View file

@ -106,7 +106,7 @@
"writecache": { "writecache": {
"path": "tmp/0/cache", "path": "tmp/0/cache",
"mem_size": 2147483648, "mem_size": 2147483648,
"small_size": 16384, "small_object_size": 16384,
"max_size": 134217728, "max_size": 134217728,
"workers_number": 30, "workers_number": 30,
"size_limit": 3221225472 "size_limit": 3221225472
@ -120,7 +120,7 @@
"perm": "0644", "perm": "0644",
"compress": true, "compress": true,
"shallow_depth": 5, "shallow_depth": 5,
"small_size_limit": 102400, "small_object_size": 102400,
"blobovnicza": { "blobovnicza": {
"size": 4194304, "size": 4194304,
"shallow_depth": 1, "shallow_depth": 1,
@ -139,7 +139,7 @@
"writecache": { "writecache": {
"path": "tmp/1/cache", "path": "tmp/1/cache",
"mem_size": 2147483648, "mem_size": 2147483648,
"small_size": 16384, "small_object_size": 16384,
"max_size": 134217728, "max_size": 134217728,
"workers_number": 30, "workers_number": 30,
"size_limit": 4294967296 "size_limit": 4294967296
@ -153,7 +153,7 @@
"perm": "0644", "perm": "0644",
"compress": false, "compress": false,
"shallow_depth": 5, "shallow_depth": 5,
"small_size_limit": 102400, "small_object_size": 102400,
"blobovnicza": { "blobovnicza": {
"size": 4194304, "size": 4194304,
"shallow_depth": 1, "shallow_depth": 1,

4
config/example/node.yaml
View file

@ -94,7 +94,7 @@ storage:
writecache: writecache:
mem_size: 2147483648 # approximate RAM usage limit for "small" objects, bytes 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 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 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 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) perm: 0644 # permissions for blobstor files(directories: +x for current user and group)
shallow_depth: 5 # max depth of object tree storage in FS 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: blobovnicza:
size: 4194304 # approximate size limit of single blobovnicza instance, total size will be: size*width^(depth+1), bytes size: 4194304 # approximate size limit of single blobovnicza instance, total size will be: size*width^(depth+1), bytes