Make sure that we specify Backoff in conjunction with MinConnectTimeo…

…ut, else we get a zero value. (#19701)
hashicorp · Mar 23, 2023 · 0be6924 · 0be6924
1 parent 449482d
commit 0be6924
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/vault/request_forwarding.go b/vault/request_forwarding.go
@@ -25,6 +25,7 @@ import (
 	"github.com/hashicorp/vault/vault/replication"
 	"golang.org/x/net/http2"
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/backoff"
 	"google.golang.org/grpc/keepalive"
 )
 
@@ -291,7 +292,10 @@ func (c *Core) refreshRequestForwardingConnection(ctx context.Context, clusterAd
 		),
 	}
 	if c.grpcMinConnectTimeout != 0 {
-		opts = append(opts, grpc.WithConnectParams(grpc.ConnectParams{MinConnectTimeout: c.grpcMinConnectTimeout}))
+		opts = append(opts, grpc.WithConnectParams(grpc.ConnectParams{
+			MinConnectTimeout: c.grpcMinConnectTimeout,
+			Backoff:           backoff.DefaultConfig,
+		}))
 	}
 	c.rpcClientConn, err = grpc.DialContext(dctx, clusterURL.Host, opts...)
 	if err != nil {