Commit 0693fbff authored by Stan Hu's avatar Stan Hu

Merge branch 'revert-b574ddd8' into 'master'

Revert "Merge branch 'wc-gitaly-keepalive-limit' into 'master'"

See merge request gitlab-org/gitlab!78966
parents 4b4e21cf aedba2fd
...@@ -56,8 +56,7 @@ module Gitlab ...@@ -56,8 +56,7 @@ module Gitlab
# https://gitlab.com/gitlab-org/gitaly/-/blob/bf9f52bc/client/dial.go#L78 # https://gitlab.com/gitlab-org/gitaly/-/blob/bf9f52bc/client/dial.go#L78
{ {
'grpc.keepalive_time_ms': 20000, 'grpc.keepalive_time_ms': 20000,
'grpc.keepalive_permit_without_calls': 1, 'grpc.keepalive_permit_without_calls': 1
'grpc.http2.max_pings_without_data': 0
} }
end end
private_class_method :channel_args private_class_method :channel_args
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment