From 9c3c98e8de5bd1ef5e9e3aa76d4510a767f02a25 Mon Sep 17 00:00:00 2001 From: Tom Wilkie Date: Thu, 26 Oct 2017 13:43:48 +0100 Subject: [PATCH] Revert "Port 'Don't disable HTTP keep-alives for remote storage connections.' to 2.0 (see #3173)" This reverts commit 0997191b182bc40a1e050856084fe9b8dc46f523. --- storage/remote/client.go | 2 +- util/httputil/client.go | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/storage/remote/client.go b/storage/remote/client.go index 462e7c5f77..82e2176908 100644 --- a/storage/remote/client.go +++ b/storage/remote/client.go @@ -54,7 +54,7 @@ type ClientConfig struct { // NewClient creates a new Client. func NewClient(index int, conf *ClientConfig) (*Client, error) { - httpClient, err := httputil.NewClientFromConfigAndOptions(conf.HTTPClientConfig, "remote_storage", false) + httpClient, err := httputil.NewClientFromConfig(conf.HTTPClientConfig, "remote_storage") if err != nil { return nil, err } diff --git a/util/httputil/client.go b/util/httputil/client.go index bed76b2438..e36e353616 100644 --- a/util/httputil/client.go +++ b/util/httputil/client.go @@ -34,12 +34,6 @@ func newClient(rt http.RoundTripper) *http.Client { // NewClientFromConfig returns a new HTTP client configured for the // given config.HTTPClientConfig. The name is used as go-conntrack metric label. func NewClientFromConfig(cfg config.HTTPClientConfig, name string) (*http.Client, error) { - return NewClientFromConfigAndOptions(cfg, name, true) -} - -// NewClientFromConfigAndOptions returns a new HTTP client configured for the -// given config.HTTPClientConfig. The name is used as go-conntrack metric label. -func NewClientFromConfigAndOptions(cfg config.HTTPClientConfig, name string, disableKeepAlives bool) (*http.Client, error) { tlsConfig, err := NewTLSConfig(cfg.TLSConfig) if err != nil { return nil, err @@ -49,7 +43,7 @@ func NewClientFromConfigAndOptions(cfg config.HTTPClientConfig, name string, dis var rt http.RoundTripper = &http.Transport{ Proxy: http.ProxyURL(cfg.ProxyURL.URL), MaxIdleConns: 20000, - DisableKeepAlives: disableKeepAlives, + DisableKeepAlives: false, TLSClientConfig: tlsConfig, DisableCompression: true, // 5 minutes is typically above the maximum sane scrape interval. So we can