Merge branch 'po-keepalive-fix' into 'master'

Fix client keep alive for all network types

See merge request gitlab-org/gitaly!1637

2 files changed, 10 insertions, 4 deletions

diff --git a/changelogs/unreleased/po-keepalive-fix.yml b/changelogs/unreleased/po-keepalive-fix.yml
new file mode 100644
index 000000000..dec65ae6e
--- /dev/null
+++ b/changelogs/unreleased/po-keepalive-fix.yml
@@ -0,0 +1,5 @@
+---
+title: Fix client keep alive for all network types
+merge_request: 1637
+author:
+type: fixed
diff --git a/client/dial.go b/client/dial.go
index 81dea7d5b..8ab04e788 100644
--- a/client/dial.go
+++ b/client/dial.go
@@ -71,13 +71,14 @@ func Dial(rawAddress string, connOpts []grpc.DialOption) (*grpc.ClientConn, erro
 
 				return net.DialTimeout("unix", path, timeout)
 			}),
-			grpc.WithKeepaliveParams(keepalive.ClientParameters{
-				Time:                20 * time.Second,
-				PermitWithoutStream: true,
-			}),
 		)
 	}
 
+	connOpts = append(connOpts, grpc.WithKeepaliveParams(keepalive.ClientParameters{
+		Time:                20 * time.Second,
+		PermitWithoutStream: true,
+	}))
+
 	conn, err := grpc.Dial(canonicalAddress, connOpts...)
 	if err != nil {
 		return nil, err