[#674] object/put: Use pseudo worker pool for local operations

After storage engine started to limit number of PUT operations there is no
need to limited worker pool in Object Put service.

Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2021-10-08 16:34:39 +03:00 committed by Alex Vanin
parent 07130855aa
commit 40a4a7faa2
8 changed files with 5 additions and 27 deletions

View file

@ -193,7 +193,7 @@ type cfgLocalStorage struct {
}
type cfgObjectRoutines struct {
putRemote, putLocal *ants.Pool
putRemote *ants.Pool
}
type cfgControlService struct {
@ -441,11 +441,6 @@ func initObjectPool(cfg *config.Config) (pool cfgObjectRoutines) {
fatalOnErr(err)
}
pool.putLocal, err = ants.NewPool(objectconfig.Put(cfg).PoolSizeLocal(), optNonBlocking)
if err != nil {
fatalOnErr(err)
}
return pool
}

View file

@ -39,15 +39,3 @@ func (g PutConfig) PoolSizeRemote() int {
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)
}
return PutPoolSizeDefault
}

View file

@ -14,14 +14,12 @@ func TestObjectSection(t *testing.T) {
empty := configtest.EmptyConfig()
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).PoolSizeRemote())
require.Equal(t, 101, objectconfig.Put(c).PoolSizeLocal())
}
configtest.ForEachFileType(path, fileConfigTest)

View file

@ -281,7 +281,7 @@ func initObjectService(c *cfg) {
objectCore.WithDeleteHandler(objInhumer),
),
putsvc.WithNetworkState(c.cfgNetmap.state),
putsvc.WithWorkerPools(c.cfgObject.pool.putRemote, c.cfgObject.pool.putLocal),
putsvc.WithWorkerPools(c.cfgObject.pool.putRemote),
putsvc.WithLogger(c.log),
)

View file

@ -65,7 +65,6 @@ NEOFS_REPLICATOR_PUT_TIMEOUT=15s
# Object service section
NEOFS_OBJECT_PUT_POOL_SIZE_REMOTE=100
NEOFS_OBJECT_PUT_POOL_SIZE_LOCAL=101
# Storage engine section
NEOFS_STORAGE_SHARD_POOL_SIZE=15

View file

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

View file

@ -85,7 +85,6 @@ replicator:
object:
put:
pool_size_remote: 100 # number of async workers for remote PUT operations
pool_size_local: 101 # number of async workers for local PUT operations
storage:
shard_pool_size: 15 # size of per-shard worker pools used for PUT operations

View file

@ -117,9 +117,9 @@ func WithNetworkMapSource(v netmap.Source) Option {
}
}
func WithWorkerPools(remote, local util.WorkerPool) Option {
func WithWorkerPools(remote util.WorkerPool) Option {
return func(c *cfg) {
c.remotePool, c.localPool = remote, local
c.remotePool = remote
}
}