From 7f343d248a85e5a1ecdb90fce6eefc4043cf97cd Mon Sep 17 00:00:00 2001
From: Travis Patterson <travis.patterson@grafana.com>
Date: Wed, 20 Jul 2022 01:29:02 -0600
Subject: [PATCH] Fix goroutine leak when using http2 (#6718)

---
 pkg/storage/chunk/cache/groupcache.go | 29 ++++++++++++++++-----------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/pkg/storage/chunk/cache/groupcache.go b/pkg/storage/chunk/cache/groupcache.go
index 14b1895101..ad3426e423 100644
--- a/pkg/storage/chunk/cache/groupcache.go
+++ b/pkg/storage/chunk/cache/groupcache.go
@@ -11,12 +11,12 @@ import (
 	"sync"
 	"time"
 
+	"golang.org/x/net/http2"
+
 	"github.com/weaveworks/common/instrument"
 
 	"github.com/prometheus/client_golang/prometheus/promauto"
 
-	"golang.org/x/net/http2"
-
 	"github.com/grafana/groupcache_exporter"
 	"github.com/mailgun/groupcache/v2"
 	"github.com/pkg/errors"
@@ -33,6 +33,13 @@ import (
 
 var (
 	ErrGroupcacheMiss = errors.New("cache miss")
+
+	http2Transport = &http2.Transport{
+		DialTLS: func(network, addr string, cfg *tls.Config) (net.Conn, error) {
+			return net.Dial(network, addr)
+		},
+		AllowHTTP: true,
+	}
 )
 
 type GroupCache struct {
@@ -79,7 +86,14 @@ func NewGroupCache(rm ringManager, config GroupCacheConfig, server *server.Serve
 	addr := fmt.Sprintf("http://%s", rm.Addr())
 	level.Info(logger).Log("msg", "groupcache local address set to", "addr", addr)
 
-	pool := groupcache.NewHTTPPoolOpts(addr, &groupcache.HTTPPoolOptions{Transport: http2Transport})
+	pool := groupcache.NewHTTPPoolOpts(
+		addr,
+		&groupcache.HTTPPoolOptions{
+			Transport: func(_ context.Context) http.RoundTripper {
+				return http2Transport
+			},
+		},
+	)
 	server.HTTP.PathPrefix("/_groupcache/").Handler(pool)
 
 	startCtx, cancel := context.WithCancel(context.Background())
@@ -246,12 +260,3 @@ func (c *group) Stop() {
 func (c *group) GetCacheType() stats.CacheType {
 	return c.cacheType
 }
-
-func http2Transport(_ context.Context) http.RoundTripper {
-	return &http2.Transport{
-		DialTLS: func(network, addr string, cfg *tls.Config) (net.Conn, error) {
-			return net.Dial(network, addr)
-		},
-		AllowHTTP: true,
-	}
-}