TrueCloudLab/frostfs-node
20
1
Fork 27
Code Issues 93 Pull requests 4 Projects Releases 1 Activity Actions

[#845] node: Configure Object PUT remote and local pools separately

Browse source 
Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2021-09-24 13:50:25 +03:00 committed by Alex Vanin
parent ee20200c2e
commit 0e3e8db5c0
6 changed files with 27 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmd/neofs-node/config.go
View file

@ -435,12 +435,12 @@ func initObjectPool(cfg *config.Config) (pool cfgObjectRoutines) {
optNonBlocking := ants.WithNonblocking(true)
pool.putRemote, err = ants.NewPool(objectconfig.Put(cfg).PoolSize(), optNonBlocking)
pool.putRemote, err = ants.NewPool(objectconfig.Put(cfg).PoolSizeRemote(), optNonBlocking)
if err != nil {
fatalOnErr(err)
}
pool.putLocal, err = ants.NewPool(objectconfig.Put(cfg).PoolSize(), optNonBlocking)
pool.putLocal, err = ants.NewPool(objectconfig.Put(cfg).PoolSizeLocal(), optNonBlocking)
if err != nil {
fatalOnErr(err)
}

18
cmd/neofs-node/config/object/config.go
View file

@ -28,11 +28,23 @@ func Put(c *config.Config) PutConfig {
}
}
// PoolSize returns value of "pool_size" config parameter.
// PoolSizeRemote returns value of "pool_size_remote" config parameter.
//
// Returns PutPoolSizeDefault if value is not positive number.
func (g PutConfig) PoolSize() int {
v := config.Int(g.cfg, "pool_size")
func (g PutConfig) PoolSizeRemote() int {
v := config.Int(g.cfg, "pool_size_remote")
if v > 0 {
return int(v)
}
return PutPoolSizeDefault
}
// PoolSizeLocal returns value of "pool_size_local" config parameter.
//
// Returns PutPoolSizeDefault if value is not positive number.
func (g PutConfig) PoolSizeLocal() int {
v := config.Int(g.cfg, "pool_size_local")
if v > 0 {
return int(v)
}

6
cmd/neofs-node/config/object/config_test.go
View file

@ -13,13 +13,15 @@ func TestObjectSection(t *testing.T) {
t.Run("defaults", func(t *testing.T) {
empty := configtest.EmptyConfig()
require.Equal(t, objectconfig.PutPoolSizeDefault, objectconfig.Put(empty).PoolSize())
require.Equal(t, objectconfig.PutPoolSizeDefault, objectconfig.Put(empty).PoolSizeRemote())
require.Equal(t, objectconfig.PutPoolSizeDefault, objectconfig.Put(empty).PoolSizeLocal())
})
const path = "../../../../config/example/node"
var fileConfigTest = func(c *config.Config) {
require.Equal(t, 100, objectconfig.Put(c).PoolSize())
require.Equal(t, 100, objectconfig.Put(c).PoolSizeRemote())
require.Equal(t, 101, objectconfig.Put(c).PoolSizeLocal())
}
configtest.ForEachFileType(path, fileConfigTest)

3
config/example/node.env
View file

@ -64,7 +64,8 @@ NEOFS_POLICER_HEAD_TIMEOUT=15s
NEOFS_REPLICATOR_PUT_TIMEOUT=15s
# Object service section
NEOFS_OBJECT_PUT_POOL_SIZE=100
NEOFS_OBJECT_PUT_POOL_SIZE_REMOTE=100
NEOFS_OBJECT_PUT_POOL_SIZE_LOCAL=101
# Storage engine section
NEOFS_STORAGE_SHARD_NUM=2

3
config/example/node.json
View file

@ -97,7 +97,8 @@
},
"object": {
"put": {
"pool_size": 100
"pool_size_remote": 100,
"pool_size_local": 101
}
},
"storage": {

3
config/example/node.yaml
View file

@ -84,7 +84,8 @@ replicator:
object:
put:
pool_size: 100
pool_size_remote: 100
pool_size_local: 101
storage:
shard_num: 2