From f6c51b7995d34368075f239ae0603a98e7842b19 Mon Sep 17 00:00:00 2001 From: Aris Tzoumas Date: Fri, 22 Sep 2023 08:17:38 +0300 Subject: [PATCH] chore: applying 1.14.1 hotfixes to main branch (#3901) --- CHANGELOG.md | 7 +++++++ processor/transformer/transformer.go | 6 +++--- router/transformer/transformer.go | 7 ++++++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 43d3db791c..9a18b291bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.14.1](https://github.com/rudderlabs/rudder-server/compare/v1.14.0...v1.14.1) (2023-09-21) + + +### Bug Fixes + +* router transformer client fails with error connect: cannot assign requested address ([#3898](https://github.com/rudderlabs/rudder-server/issues/3898)) ([1cb5d5d](https://github.com/rudderlabs/rudder-server/commit/1cb5d5d725c8c8b84a66129e6d05a02ace9ff2c6)) + ## [1.14.0](https://github.com/rudderlabs/rudder-server/compare/v1.13.0...v1.14.0) (2023-09-20) diff --git a/processor/transformer/transformer.go b/processor/transformer/transformer.go index 0014f25f7f..575002044b 100644 --- a/processor/transformer/transformer.go +++ b/processor/transformer/transformer.go @@ -208,8 +208,8 @@ func NewTransformer(conf *config.Config, log logger.Logger, stat stats.Stats, op trans.cpDownGauge = stat.NewStat("processor.control_plane_down", stats.GaugeType) trans.config.maxConcurrency = conf.GetInt("Processor.maxConcurrency", 200) - trans.config.maxHTTPConnections = conf.GetInt("Processor.maxHTTPConnections", 100) - trans.config.maxHTTPIdleConnections = conf.GetInt("Processor.maxHTTPIdleConnections", 5) + trans.config.maxHTTPConnections = conf.GetInt("Transformer.Client.maxHTTPConnections", 100) + trans.config.maxHTTPIdleConnections = conf.GetInt("Transformer.Client.maxHTTPIdleConnections", 10) trans.config.disableKeepAlives = conf.GetBool("Transformer.Client.disableKeepAlives", true) trans.config.timeoutDuration = conf.GetDuration("HttpClient.procTransformer.timeout", 600, time.Second) trans.config.destTransformationURL = conf.GetString("DEST_TRANSFORM_URL", "http://localhost:9090") @@ -227,7 +227,7 @@ func NewTransformer(conf *config.Config, log logger.Logger, stat stats.Stats, op DisableKeepAlives: trans.config.disableKeepAlives, MaxConnsPerHost: trans.config.maxHTTPConnections, MaxIdleConnsPerHost: trans.config.maxHTTPIdleConnections, - IdleConnTimeout: time.Minute, + IdleConnTimeout: 30 * time.Second, }, Timeout: trans.config.timeoutDuration, } diff --git a/router/transformer/transformer.go b/router/transformer/transformer.go index 18c57cd1b6..7bce15b2f0 100644 --- a/router/transformer/transformer.go +++ b/router/transformer/transformer.go @@ -288,7 +288,12 @@ func (trans *handle) setup(destinationTimeout, transformTimeout time.Duration) { trans.logger = loggerOverride } - trans.tr = &http.Transport{DisableKeepAlives: config.GetBool("Transformer.Client.disableKeepAlives", true)} + trans.tr = &http.Transport{ + DisableKeepAlives: config.GetBool("Transformer.Client.disableKeepAlives", true), + MaxConnsPerHost: config.GetInt("Transformer.Client.maxHTTPConnections", 100), + MaxIdleConnsPerHost: config.GetInt("Transformer.Client.maxHTTPIdleConnections", 10), + IdleConnTimeout: 30 * time.Second, + } // The timeout between server and transformer // Basically this timeout is more for communication between transformer and server trans.transformTimeout = transformTimeout