Skip to content
Snippets Groups Projects
Commit e0d6b5c1 authored by Kamil Trzciński's avatar Kamil Trzciński
Browse files

Merge branch 'fix-network-timeouts' into 'master'

Fix network timeouts

Closes gitlab-com/infrastructure#2318

See merge request !634
parents ac9fd296 e9945761
Branches
No related tags found
No related merge requests found
...@@ -158,11 +158,13 @@ func (n *client) createTransport() { ...@@ -158,11 +158,13 @@ func (n *client) createTransport() {
return dialer.Dial(network, addr) return dialer.Dial(network, addr)
}, },
TLSClientConfig: &tlsConfig, TLSClientConfig: &tlsConfig,
MaxIdleConns: 100,
IdleConnTimeout: 90 * time.Second,
TLSHandshakeTimeout: 10 * time.Second, TLSHandshakeTimeout: 10 * time.Second,
ExpectContinueTimeout: 1 * time.Second, ExpectContinueTimeout: 1 * time.Second,
IdleConnTimeout: 30 * time.Second, ResponseHeaderTimeout: 10 * time.Minute,
ResponseHeaderTimeout: 10 * time.Second,
} }
n.Timeout = common.DefaultNetworkClientTimeout
} }
func (n *client) getCAChain(tls *tls.ConnectionState) string { func (n *client) getCAChain(tls *tls.ConnectionState) string {
...@@ -366,7 +368,6 @@ func newClient(requestCredentials requestCredentials) (c *client, err error) { ...@@ -366,7 +368,6 @@ func newClient(requestCredentials requestCredentials) (c *client, err error) {
compatibleWithGitLab: true, compatibleWithGitLab: true,
requestBackOffs: make(map[string]*backoff.Backoff), requestBackOffs: make(map[string]*backoff.Backoff),
} }
c.Timeout = common.DefaultNetworkClientTimeout
host := strings.Split(url.Host, ":")[0] host := strings.Split(url.Host, ":")[0]
if CertificateDirectory != "" { if CertificateDirectory != "" {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment