From da51c119d5decf1ed6ba48e2b455bccfc686c8de Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Mon, 18 Oct 2021 17:08:01 +0300 Subject: [PATCH] [#859] config: rename `opened_cache_size` to `opened_cache_capacity` Capacity is a common term to use with cache, see e.g. leveldb configuration. Signed-off-by: Evgenii Stratonikov --- .../config/engine/shard/blobstor/blobovnicza/config.go | 4 ++-- config/example/node.env | 4 ++-- config/example/node.json | 4 ++-- config/example/node.yaml | 2 +- config/mainnet/config.yml | 2 +- config/testnet/config.yml | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cmd/neofs-node/config/engine/shard/blobstor/blobovnicza/config.go b/cmd/neofs-node/config/engine/shard/blobstor/blobovnicza/config.go index 834afac29..a5eeb0ced 100644 --- a/cmd/neofs-node/config/engine/shard/blobstor/blobovnicza/config.go +++ b/cmd/neofs-node/config/engine/shard/blobstor/blobovnicza/config.go @@ -76,13 +76,13 @@ func (x *Config) ShallowWidth() uint64 { return ShallowWidthDefault } -// OpenedCacheSize returns value of "opened_cache_size" config parameter. +// OpenedCacheSize returns value of "opened_cache_capacity" config parameter. // // Returns OpenedCacheSizeDefault if value is not a positive number. func (x *Config) OpenedCacheSize() int { d := config.IntSafe( (*config.Config)(x), - "opened_cache_size", + "opened_cache_capacity", ) if d > 0 { diff --git a/config/example/node.env b/config/example/node.env index 6db62f525..dd9758aca 100644 --- a/config/example/node.env +++ b/config/example/node.env @@ -91,7 +91,7 @@ NEOFS_STORAGE_SHARD_0_BLOBSTOR_SMALL_OBJECT_SIZE=102400 NEOFS_STORAGE_SHARD_0_BLOBSTOR_BLOBOVNICZA_SIZE=4194304 NEOFS_STORAGE_SHARD_0_BLOBSTOR_BLOBOVNICZA_SHALLOW_DEPTH=1 NEOFS_STORAGE_SHARD_0_BLOBSTOR_BLOBOVNICZA_SHALLOW_WIDTH=4 -NEOFS_STORAGE_SHARD_0_BLOBSTOR_BLOBOVNICZA_OPENED_CACHE_SIZE=50 +NEOFS_STORAGE_SHARD_0_BLOBSTOR_BLOBOVNICZA_OPENED_CACHE_CAPACITY=50 ### GC config #### Limit of the single data remover's batching operation in number of objects NEOFS_STORAGE_SHARD_0_GC_REMOVER_BATCH_SIZE=150 @@ -122,7 +122,7 @@ NEOFS_STORAGE_SHARD_1_BLOBSTOR_SMALL_OBJECT_SIZE=102400 NEOFS_STORAGE_SHARD_1_BLOBSTOR_BLOBOVNICZA_SIZE=4194304 NEOFS_STORAGE_SHARD_1_BLOBSTOR_BLOBOVNICZA_SHALLOW_DEPTH=1 NEOFS_STORAGE_SHARD_1_BLOBSTOR_BLOBOVNICZA_SHALLOW_WIDTH=4 -NEOFS_STORAGE_SHARD_1_BLOBSTOR_BLOBOVNICZA_OPENED_CACHE_SIZE=50 +NEOFS_STORAGE_SHARD_1_BLOBSTOR_BLOBOVNICZA_OPENED_CACHE_CAPACITY=50 ### GC config #### Limit of the single data remover's batching operation in number of objects NEOFS_STORAGE_SHARD_1_GC_REMOVER_BATCH_SIZE=200 diff --git a/config/example/node.json b/config/example/node.json index 854bdd14b..82e0d3b29 100644 --- a/config/example/node.json +++ b/config/example/node.json @@ -125,7 +125,7 @@ "size": 4194304, "shallow_depth": 1, "shallow_width": 4, - "opened_cache_size": 50 + "opened_cache_capacity": 50 } }, "gc": { @@ -158,7 +158,7 @@ "size": 4194304, "shallow_depth": 1, "shallow_width": 4, - "opened_cache_size": 50 + "opened_cache_capacity": 50 } }, "gc": { diff --git a/config/example/node.yaml b/config/example/node.yaml index 844b937ce..e322f4ee3 100644 --- a/config/example/node.yaml +++ b/config/example/node.yaml @@ -111,7 +111,7 @@ storage: size: 4194304 # approximate size limit of single blobovnicza instance, total size will be: size*width^(depth+1), bytes shallow_depth: 1 # max depth of object tree storage in key-value DB shallow_width: 4 # max width of object tree storage in key-value DB - opened_cache_size: 50 # maximum number of opened database files + opened_cache_capacity: 50 # maximum number of opened database files gc: remover_batch_size: 200 # number of objects to be removed by the garbage collector diff --git a/config/mainnet/config.yml b/config/mainnet/config.yml index 6f221ffb2..ac8492c26 100644 --- a/config/mainnet/config.yml +++ b/config/mainnet/config.yml @@ -28,7 +28,7 @@ storage: path: /blobstor perm: 0600 blobovnicza: - opened_cache_size: 32 + opened_cache_capacity: 32 shallow_depth: 1 shallow_width: 1 gc: diff --git a/config/testnet/config.yml b/config/testnet/config.yml index 8418612e8..9974b9b13 100644 --- a/config/testnet/config.yml +++ b/config/testnet/config.yml @@ -47,7 +47,7 @@ storage: path: /storage/blobstor perm: 0777 blobovnicza: - opened_cache_size: 32 + opened_cache_capacity: 32 shallow_depth: 1 shallow_width: 1 gc: