From 25ac536ef9e7653b112615f47b5812a346ec64c6 Mon Sep 17 00:00:00 2001 From: Will Chandler Date: Thu, 25 Apr 2024 17:47:07 +0000 Subject: [PATCH] Revert "Merge branch 'smh-revert-wait-for-handlers' into 'master'" This reverts merge request !6803 --- internal/gitaly/server/server.go | 1 + internal/praefect/server.go | 1 + 2 files changed, 2 insertions(+) diff --git a/internal/gitaly/server/server.go b/internal/gitaly/server/server.go index fd39ec9ab1..bd373b87ab 100644 --- a/internal/gitaly/server/server.go +++ b/internal/gitaly/server/server.go @@ -187,6 +187,7 @@ func (s *GitalyServerFactory) New(external, secure bool, opts ...Option) (*grpc. grpc.KeepaliveParams(keepalive.ServerParameters{ Time: 5 * time.Minute, }), + grpc.WaitForHandlers(true), } return grpc.NewServer(serverOptions...), nil diff --git a/internal/praefect/server.go b/internal/praefect/server.go index f985791b1c..48cacfc2fa 100644 --- a/internal/praefect/server.go +++ b/internal/praefect/server.go @@ -167,6 +167,7 @@ func NewGRPCServer( grpc.KeepaliveParams(keepalive.ServerParameters{ Time: 5 * time.Minute, }), + grpc.WaitForHandlers(true), }...) // Accept backchannel connections so that we can proxy sidechannels -- GitLab