[#1031] node: Add maxConnPerHost to config

It allows configuring number of neo-go client opened connections per one
host.

Signed-off-by: Pavel Karpy <carpawell@nspcc.ru>
This commit is contained in:
Pavel Karpy 2021-12-15 21:03:06 +03:00 committed by Alex Vanin
parent 90dbf3d944
commit 63e035bd8a
5 changed files with 20 additions and 1 deletions

View file

@ -19,6 +19,9 @@ const (
// NotaryDepositDurationDefault is a default deposit duration. // NotaryDepositDurationDefault is a default deposit duration.
NotaryDepositDurationDefault uint32 = 1000 NotaryDepositDurationDefault uint32 = 1000
// MaxConnPerHostDefault is a default maximum of connections per host of the morph client.
MaxConnPerHostDefault = 10
) )
// RPCEndpoint returns list of values of "rpc_endpoint" config parameter // RPCEndpoint returns list of values of "rpc_endpoint" config parameter
@ -65,3 +68,14 @@ func DialTimeout(c *config.Config) time.Duration {
func DisableCache(c *config.Config) bool { func DisableCache(c *config.Config) bool {
return config.BoolSafe(c.Sub(subsection), "disable_cache") return config.BoolSafe(c.Sub(subsection), "disable_cache")
} }
// MaxConnPerHost return value of "max_connections_per_host" config
// parameter from "morph" section.
func MaxConnPerHost(c *config.Config) int {
v := config.Uint32Safe(c.Sub(subsection), "max_connections_per_host")
if v > 0 {
return int(v)
}
return MaxConnPerHostDefault
}

View file

@ -18,6 +18,7 @@ func TestMorphSection(t *testing.T) {
require.Panics(t, func() { morphconfig.NotificationEndpoint(empty) }) require.Panics(t, func() { morphconfig.NotificationEndpoint(empty) })
require.Equal(t, morphconfig.DialTimeoutDefault, morphconfig.DialTimeout(empty)) require.Equal(t, morphconfig.DialTimeoutDefault, morphconfig.DialTimeout(empty))
require.Equal(t, false, morphconfig.DisableCache(empty)) require.Equal(t, false, morphconfig.DisableCache(empty))
require.Equal(t, 10, morphconfig.MaxConnPerHost(empty))
}) })
const path = "../../../../config/example/node" const path = "../../../../config/example/node"
@ -39,6 +40,7 @@ func TestMorphSection(t *testing.T) {
require.Equal(t, wss, morphconfig.NotificationEndpoint(c)) require.Equal(t, wss, morphconfig.NotificationEndpoint(c))
require.Equal(t, 30*time.Second, morphconfig.DialTimeout(c)) require.Equal(t, 30*time.Second, morphconfig.DialTimeout(c))
require.Equal(t, true, morphconfig.DisableCache(c)) require.Equal(t, true, morphconfig.DisableCache(c))
require.Equal(t, 11, morphconfig.MaxConnPerHost(c))
} }
configtest.ForEachFileType(path, fileConfigTest) configtest.ForEachFileType(path, fileConfigTest)

View file

@ -49,6 +49,7 @@ NEOFS_MORPH_DIAL_TIMEOUT=30s
NEOFS_MORPH_DISABLE_CACHE=true NEOFS_MORPH_DISABLE_CACHE=true
NEOFS_MORPH_RPC_ENDPOINT="https://rpc1.morph.fs.neo.org:40341 https://rpc2.morph.fs.neo.org:40341" NEOFS_MORPH_RPC_ENDPOINT="https://rpc1.morph.fs.neo.org:40341 https://rpc2.morph.fs.neo.org:40341"
NEOFS_MORPH_NOTIFICATION_ENDPOINT="wss://rpc1.morph.fs.neo.org:40341/ws wss://rpc2.morph.fs.neo.org:40341/ws" NEOFS_MORPH_NOTIFICATION_ENDPOINT="wss://rpc1.morph.fs.neo.org:40341/ws wss://rpc2.morph.fs.neo.org:40341/ws"
NEOFS_MORPH_MAX_CONNECTIONS_PER_HOST=11
# Main chain section (optional) # Main chain section (optional)
NEOFS_MAINCHAIN_DIAL_TIMEOUT=30s NEOFS_MAINCHAIN_DIAL_TIMEOUT=30s

View file

@ -88,7 +88,8 @@
"notification_endpoint": [ "notification_endpoint": [
"wss://rpc1.morph.fs.neo.org:40341/ws", "wss://rpc1.morph.fs.neo.org:40341/ws",
"wss://rpc2.morph.fs.neo.org:40341/ws" "wss://rpc2.morph.fs.neo.org:40341/ws"
] ],
"max_connections_per_host": 11
}, },
"mainchain": { "mainchain": {
"dial_timeout": "30s", "dial_timeout": "30s",

View file

@ -74,6 +74,7 @@ morph:
notification_endpoint: # side chain NEO RPC notification endpoints; are shuffled and used only the first non-error one notification_endpoint: # side chain NEO RPC notification endpoints; are shuffled and used only the first non-error one
- wss://rpc1.morph.fs.neo.org:40341/ws - wss://rpc1.morph.fs.neo.org:40341/ws
- wss://rpc2.morph.fs.neo.org:40341/ws - wss://rpc2.morph.fs.neo.org:40341/ws
max_connections_per_host: 11 # maximum of open connections per one host
mainchain: # DEPRECATED section, is not used and not read mainchain: # DEPRECATED section, is not used and not read
dial_timeout: 30s # timeout for main chain NEO RPC client connection dial_timeout: 30s # timeout for main chain NEO RPC client connection