Skip to content

Commit

Permalink
chore: applying 1.14.1 hotfixes to main branch (#3901)
Browse files Browse the repository at this point in the history
  • Loading branch information
atzoum authored Sep 22, 2023
1 parent 2a5547f commit f6c51b7
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 4 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)


Expand Down
6 changes: 3 additions & 3 deletions processor/transformer/transformer.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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,
}
Expand Down
7 changes: 6 additions & 1 deletion router/transformer/transformer.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f6c51b7

Please sign in to comment.