From 306609030ab85ea33dead538cd831fa6b2d278d4 Mon Sep 17 00:00:00 2001 From: Pavel Karpy Date: Wed, 14 Dec 2022 19:28:44 +0300 Subject: [PATCH] [#2159] node: Add tree replication timeout configuration Signed-off-by: Pavel Karpy --- CHANGELOG.md | 3 +++ cmd/frostfs-node/config/tree/config.go | 14 +++++++++++++- cmd/frostfs-node/config/tree/config_test.go | 3 +++ cmd/frostfs-node/tree.go | 1 + config/example/node.env | 1 + config/example/node.json | 3 ++- config/example/node.yaml | 1 + pkg/services/tree/options.go | 10 ++++++++++ pkg/services/tree/replicator.go | 2 +- pkg/services/tree/service.go | 1 + 10 files changed, 36 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 303f17a22..4a8920f7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ Changelog for NeoFS Node - `neofs-cli neofs-cli acl basic/extended print` commands (#2012) - `neofs_node_object_*_req_count_success` prometheus metrics for tracking successfully executed requests (#1984) - Metric 'readonly' to get shards mode (#2022) +- Tree service replication timeout (#2159) ### Changed - `object lock` command reads CID and OID the same way other commands do (#1971) @@ -80,6 +81,8 @@ Added `neofs_node_object_*_req_count_success` metrics for tracking successfully `neofs-cli container delete` command now requires given account or session issuer to match the container owner. Use `--force` (`-f`) flag to bypass this requirement. +Tree service network replication can now be fine-tuned with `tree.replication_timeout` config field. + ## [0.34.0] - 2022-10-31 - Marado (마라도, 馬羅島) ### Added diff --git a/cmd/frostfs-node/config/tree/config.go b/cmd/frostfs-node/config/tree/config.go index 8f4341e47..632785873 100644 --- a/cmd/frostfs-node/config/tree/config.go +++ b/cmd/frostfs-node/config/tree/config.go @@ -1,6 +1,10 @@ package treeconfig -import "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" +import ( + "time" + + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" +) const ( subsection = "tree" @@ -36,6 +40,14 @@ func (c TreeConfig) CacheSize() int { return int(config.IntSafe(c.cfg, "cache_size")) } +// ReplicationTimeout returns the value of "replication_timeout" +// config parameter from the "tree" section. +// +// Returns `0` if config value is not specified. +func (c TreeConfig) ReplicationTimeout() time.Duration { + return config.DurationSafe(c.cfg, "replication_timeout") +} + // ReplicationChannelCapacity returns the value of "replication_channel_capacity" // config parameter from the "tree" section. // diff --git a/cmd/frostfs-node/config/tree/config_test.go b/cmd/frostfs-node/config/tree/config_test.go index f2f2ff225..4270213c4 100644 --- a/cmd/frostfs-node/config/tree/config_test.go +++ b/cmd/frostfs-node/config/tree/config_test.go @@ -2,6 +2,7 @@ package treeconfig_test import ( "testing" + "time" "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" configtest "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" @@ -19,6 +20,7 @@ func TestTreeSection(t *testing.T) { require.Equal(t, 0, treeSec.CacheSize()) require.Equal(t, 0, treeSec.ReplicationChannelCapacity()) require.Equal(t, 0, treeSec.ReplicationWorkerCount()) + require.Equal(t, time.Duration(0), treeSec.ReplicationTimeout()) }) const path = "../../../../config/example/node" @@ -30,6 +32,7 @@ func TestTreeSection(t *testing.T) { require.Equal(t, 15, treeSec.CacheSize()) require.Equal(t, 32, treeSec.ReplicationChannelCapacity()) require.Equal(t, 32, treeSec.ReplicationWorkerCount()) + require.Equal(t, 5*time.Second, treeSec.ReplicationTimeout()) } configtest.ForEachFileType(path, fileConfigTest) diff --git a/cmd/frostfs-node/tree.go b/cmd/frostfs-node/tree.go index e64625851..fce00fd3a 100644 --- a/cmd/frostfs-node/tree.go +++ b/cmd/frostfs-node/tree.go @@ -51,6 +51,7 @@ func initTreeService(c *cfg) { tree.WithLogger(c.log), tree.WithStorage(c.cfgObject.cfgLocalStorage.localStorage), tree.WithContainerCacheSize(treeConfig.CacheSize()), + tree.WithReplicationTimeout(treeConfig.ReplicationTimeout()), tree.WithReplicationChannelCapacity(treeConfig.ReplicationChannelCapacity()), tree.WithReplicationWorkerCount(treeConfig.ReplicationWorkerCount())) diff --git a/config/example/node.env b/config/example/node.env index 62b6d483b..98186ef9e 100644 --- a/config/example/node.env +++ b/config/example/node.env @@ -34,6 +34,7 @@ NEOFS_TREE_ENABLED=true NEOFS_TREE_CACHE_SIZE=15 NEOFS_TREE_REPLICATION_CHANNEL_CAPACITY=32 NEOFS_TREE_REPLICATION_WORKER_COUNT=32 +NEOFS_TREE_REPLICATION_TIMEOUT=5s # gRPC section ## 0 server diff --git a/config/example/node.json b/config/example/node.json index 23113eb0b..e0fcc8eaf 100644 --- a/config/example/node.json +++ b/config/example/node.json @@ -79,7 +79,8 @@ "enabled": true, "cache_size": 15, "replication_channel_capacity": 32, - "replication_worker_count": 32 + "replication_worker_count": 32, + "replication_timeout": "5s" }, "control": { "authorized_keys": [ diff --git a/config/example/node.yaml b/config/example/node.yaml index 2eda97523..89f24144d 100644 --- a/config/example/node.yaml +++ b/config/example/node.yaml @@ -64,6 +64,7 @@ tree: cache_size: 15 replication_worker_count: 32 replication_channel_capacity: 32 + replication_timeout: 5s control: authorized_keys: # list of hex-encoded public keys that have rights to use the Control Service diff --git a/pkg/services/tree/options.go b/pkg/services/tree/options.go index bd56434d9..3653da50c 100644 --- a/pkg/services/tree/options.go +++ b/pkg/services/tree/options.go @@ -2,6 +2,7 @@ package tree import ( "crypto/ecdsa" + "time" "github.com/TrueCloudLab/frostfs-node/pkg/core/container" "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" @@ -30,6 +31,7 @@ type cfg struct { // replication-related parameters replicatorChannelCapacity int replicatorWorkerCount int + replicatorTimeout time.Duration containerCacheSize int } @@ -106,3 +108,11 @@ func WithContainerCacheSize(n int) Option { } } } + +func WithReplicationTimeout(t time.Duration) Option { + return func(c *cfg) { + if t > 0 { + c.replicatorTimeout = t + } + } +} diff --git a/pkg/services/tree/replicator.go b/pkg/services/tree/replicator.go index 82ed275b9..e7cf1508f 100644 --- a/pkg/services/tree/replicator.go +++ b/pkg/services/tree/replicator.go @@ -49,7 +49,7 @@ func (s *Service) replicationWorker() { return false } - ctx, cancel := context.WithTimeout(context.Background(), defaultReplicatorSendTimeout) + ctx, cancel := context.WithTimeout(context.Background(), s.replicatorTimeout) _, lastErr = c.Apply(ctx, task.req) cancel() diff --git a/pkg/services/tree/service.go b/pkg/services/tree/service.go index d9ce03de1..941a80d8f 100644 --- a/pkg/services/tree/service.go +++ b/pkg/services/tree/service.go @@ -37,6 +37,7 @@ func New(opts ...Option) *Service { s.containerCacheSize = defaultContainerCacheSize s.replicatorChannelCapacity = defaultReplicatorCapacity s.replicatorWorkerCount = defaultReplicatorWorkerCount + s.replicatorTimeout = defaultReplicatorSendTimeout for i := range opts { opts[i](&s.cfg)