From 00ca8b30a98ab36de548f1029767706cadff886f Mon Sep 17 00:00:00 2001 From: n-marton Date: Fri, 10 May 2024 09:19:03 +0200 Subject: [PATCH] also pass down max conns per host to consul and nomad http transports Signed-off-by: n-marton --- dependency/client_set.go | 4 ++++ manager/runner.go | 2 ++ 2 files changed, 6 insertions(+) diff --git a/dependency/client_set.go b/dependency/client_set.go index 298a61831..95c3095a5 100644 --- a/dependency/client_set.go +++ b/dependency/client_set.go @@ -81,6 +81,7 @@ type CreateConsulClientInput struct { TransportIdleConnTimeout time.Duration TransportMaxIdleConns int TransportMaxIdleConnsPerHost int + TransportMaxConnsPerHost int TransportTLSHandshakeTimeout time.Duration } @@ -138,6 +139,7 @@ type CreateNomadClientInput struct { TransportIdleConnTimeout time.Duration TransportMaxIdleConns int TransportMaxIdleConnsPerHost int + TransportMaxConnsPerHost int TransportTLSHandshakeTimeout time.Duration } @@ -184,6 +186,7 @@ func (c *ClientSet) CreateConsulClient(i *CreateConsulClientInput) error { MaxIdleConns: i.TransportMaxIdleConns, IdleConnTimeout: i.TransportIdleConnTimeout, MaxIdleConnsPerHost: i.TransportMaxIdleConnsPerHost, + MaxConnsPerHost: i.TransportMaxConnsPerHost, TLSHandshakeTimeout: i.TransportTLSHandshakeTimeout, } @@ -416,6 +419,7 @@ func (c *ClientSet) CreateNomadClient(i *CreateNomadClientInput) error { MaxIdleConns: i.TransportMaxIdleConns, IdleConnTimeout: i.TransportIdleConnTimeout, MaxIdleConnsPerHost: i.TransportMaxIdleConnsPerHost, + MaxConnsPerHost: i.TransportMaxConnsPerHost, TLSHandshakeTimeout: i.TransportTLSHandshakeTimeout, } diff --git a/manager/runner.go b/manager/runner.go index 8c16c727b..8c6908ff2 100644 --- a/manager/runner.go +++ b/manager/runner.go @@ -1393,6 +1393,7 @@ func NewClientSet(c *config.Config) (*dep.ClientSet, error) { TransportIdleConnTimeout: config.TimeDurationVal(c.Consul.Transport.IdleConnTimeout), TransportMaxIdleConns: config.IntVal(c.Consul.Transport.MaxIdleConns), TransportMaxIdleConnsPerHost: config.IntVal(c.Consul.Transport.MaxIdleConnsPerHost), + TransportMaxConnsPerHost: config.IntVal(c.Consul.Transport.MaxConnsPerHost), TransportTLSHandshakeTimeout: config.TimeDurationVal(c.Consul.Transport.TLSHandshakeTimeout), }); err != nil { return nil, fmt.Errorf("runner: %s", err) @@ -1449,6 +1450,7 @@ func NewClientSet(c *config.Config) (*dep.ClientSet, error) { TransportIdleConnTimeout: config.TimeDurationVal(c.Nomad.Transport.IdleConnTimeout), TransportMaxIdleConns: config.IntVal(c.Nomad.Transport.MaxIdleConns), TransportMaxIdleConnsPerHost: config.IntVal(c.Nomad.Transport.MaxIdleConnsPerHost), + TransportMaxConnsPerHost: config.IntVal(c.Nomad.Transport.MaxConnsPerHost), TransportTLSHandshakeTimeout: config.TimeDurationVal(c.Nomad.Transport.TLSHandshakeTimeout), }); err != nil { return nil, fmt.Errorf("runner: %s", err)