Skip to content

Commit

Permalink
resolver: fix tcp connections limit
Browse files Browse the repository at this point in the history
Signed-off-by: Tonis Tiigi <[email protected]>
  • Loading branch information
tonistiigi committed Feb 19, 2021
1 parent 25bd56b commit 58dc579
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions util/resolver/resolver.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func fillInsecureOpts(host string, c config.RegistryConfig, h docker.RegistryHos
}
if c.Insecure != nil && *c.Insecure {
h2 := h
transport := newDefaultTransport()
transport := newTransport()
transport.TLSClientConfig = tc
h2.Client = &http.Client{
Transport: tracing.NewTransport(transport),
Expand All @@ -53,7 +53,7 @@ func fillInsecureOpts(host string, c config.RegistryConfig, h docker.RegistryHos
}

if len(hosts) == 0 {
transport := newDefaultTransport()
transport := newTransport()
transport.TLSClientConfig = tc

h.Client = &http.Client{
Expand Down Expand Up @@ -172,18 +172,20 @@ func NewRegistryConfig(m map[string]config.RegistryConfig) docker.RegistryHosts

func newDefaultClient() *http.Client {
return &http.Client{
Transport: tracing.NewTransport(newDefaultTransport()),
Transport: tracing.NewTransport(defaultTransport),
}
}

// newDefaultTransport is for pull or push client
var defaultTransport = newTransport()

// newTransport 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 newDefaultTransport() *http.Transport {
func newTransport() *http.Transport {
return &http.Transport{
Proxy: http.ProxyFromEnvironment,
DialContext: (&net.Dialer{
Expand All @@ -194,6 +196,7 @@ func newDefaultTransport() *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),
}
}

0 comments on commit 58dc579

Please sign in to comment.