From 49c4ab46ad74f1c6f0ab7ffb7a5c1e378f8a525a Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Sat, 20 Feb 2021 12:15:25 -0800 Subject: [PATCH] Revert "resolver: fix tcp connections limit" This reverts commit 58dc579d5784e663a55a96d8277c3a2a8f45132f. Signed-off-by: Tonis Tiigi --- util/resolver/resolver.go | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/util/resolver/resolver.go b/util/resolver/resolver.go index ee863c82..42c940b3 100644 --- a/util/resolver/resolver.go +++ b/util/resolver/resolver.go @@ -43,7 +43,7 @@ func fillInsecureOpts(host string, c config.RegistryConfig, h docker.RegistryHos } if c.Insecure != nil && *c.Insecure { h2 := h - transport := newTransport() + transport := newDefaultTransport() transport.TLSClientConfig = tc h2.Client = &http.Client{ Transport: tracing.NewTransport(transport), @@ -53,7 +53,7 @@ func fillInsecureOpts(host string, c config.RegistryConfig, h docker.RegistryHos } if len(hosts) == 0 { - transport := newTransport() + transport := newDefaultTransport() transport.TLSClientConfig = tc h.Client = &http.Client{ @@ -172,20 +172,18 @@ func NewRegistryConfig(m map[string]config.RegistryConfig) docker.RegistryHosts func newDefaultClient() *http.Client { return &http.Client{ - Transport: tracing.NewTransport(defaultTransport), + Transport: tracing.NewTransport(newDefaultTransport()), } } -var defaultTransport = newTransport() - -// newTransport is for pull or push client +// newDefaultTransport is for pull or push client // // NOTE: For push, there must disable http2 for https because the flow control // will limit data transfer. The net/http package doesn't provide http2 tunable // settings which limits push performance. // // REF: https://github.com/golang/go/issues/14077 -func newTransport() *http.Transport { +func newDefaultTransport() *http.Transport { return &http.Transport{ Proxy: http.ProxyFromEnvironment, DialContext: (&net.Dialer{ @@ -196,7 +194,6 @@ func newTransport() *http.Transport { IdleConnTimeout: 30 * time.Second, TLSHandshakeTimeout: 10 * time.Second, ExpectContinueTimeout: 5 * time.Second, - MaxConnsPerHost: 6, TLSNextProto: make(map[string]func(authority string, c *tls.Conn) http.RoundTripper), } }