From 9610dac053b650be25892ef949cedd69a284012e Mon Sep 17 00:00:00 2001 From: Nick Cabatoff Date: Thu, 23 Mar 2023 09:58:08 -0400 Subject: [PATCH] Include change from #19701. --- vault/request_forwarding.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vault/request_forwarding.go b/vault/request_forwarding.go index 2b436d46f2a9..28e89bf23008 100644 --- a/vault/request_forwarding.go +++ b/vault/request_forwarding.go @@ -22,6 +22,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" ) @@ -288,7 +289,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 {