From 00f14d4dcd5103d8c447ece2e4a1f6deb4ce7cec Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Thu, 7 Oct 2021 19:17:07 +0300 Subject: [PATCH] [#857] config: use size suffixes where possible Signed-off-by: Evgenii Stratonikov --- .../config/engine/shard/blobstor/blobovnicza/config.go | 2 +- cmd/neofs-node/config/engine/shard/blobstor/config.go | 2 +- cmd/neofs-node/config/engine/shard/writecache/config.go | 8 ++++---- 3 files changed, 6 insertions(+), 6 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 51ffa44dc..834afac29 100644 --- a/cmd/neofs-node/config/engine/shard/blobstor/blobovnicza/config.go +++ b/cmd/neofs-node/config/engine/shard/blobstor/blobovnicza/config.go @@ -32,7 +32,7 @@ func From(c *config.Config) *Config { // // Returns SizeDefault if value is not a positive number. func (x *Config) Size() uint64 { - s := config.UintSafe( + s := config.SizeInBytesSafe( (*config.Config)(x), "size", ) diff --git a/cmd/neofs-node/config/engine/shard/blobstor/config.go b/cmd/neofs-node/config/engine/shard/blobstor/config.go index e9b777683..86921952a 100644 --- a/cmd/neofs-node/config/engine/shard/blobstor/config.go +++ b/cmd/neofs-node/config/engine/shard/blobstor/config.go @@ -92,7 +92,7 @@ func (x *Config) Compress() bool { // // Returns SmallSizeLimitDefault if value is not a positive number. func (x *Config) SmallSizeLimit() uint64 { - l := config.UintSafe( + l := config.SizeInBytesSafe( (*config.Config)(x), "small_size_limit", ) diff --git a/cmd/neofs-node/config/engine/shard/writecache/config.go b/cmd/neofs-node/config/engine/shard/writecache/config.go index 00ff447c2..ec65a5a61 100644 --- a/cmd/neofs-node/config/engine/shard/writecache/config.go +++ b/cmd/neofs-node/config/engine/shard/writecache/config.go @@ -51,7 +51,7 @@ func (x *Config) Path() string { // // Returns MemSizeDefault if value is not a positive number. func (x *Config) MemSize() uint64 { - s := config.UintSafe( + s := config.SizeInBytesSafe( (*config.Config)(x), "mem_size", ) @@ -67,7 +67,7 @@ func (x *Config) MemSize() uint64 { // // Returns SmallSizeDefault if value is not a positive number. func (x *Config) SmallObjectSize() uint64 { - s := config.UintSafe( + s := config.SizeInBytesSafe( (*config.Config)(x), "small_size", ) @@ -83,7 +83,7 @@ func (x *Config) SmallObjectSize() uint64 { // // Returns MaxSizeDefault if value is not a positive number. func (x *Config) MaxObjectSize() uint64 { - s := config.UintSafe( + s := config.SizeInBytesSafe( (*config.Config)(x), "max_size", ) @@ -115,7 +115,7 @@ func (x *Config) WorkersNumber() int { // // Returns SizeLimitDefault if value is not a positive number. func (x *Config) SizeLimit() uint64 { - c := config.UintSafe( + c := config.SizeInBytesSafe( (*config.Config)(x), "size_limit", )