Send tunnel reconnects before waiting for sessions to drain (#24141)

gravitational · Apr 5, 2023 · 7e88827 · 7e88827
1 parent 35f9e42
commit 7e88827
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/lib/reversetunnel/srv.go b/lib/reversetunnel/srv.go
@@ -613,8 +613,6 @@ func (s *server) Close() error {
 func (s *server) DrainConnections(ctx context.Context) error {
 	// Ensure listener is closed before sending reconnects.
 	err := s.srv.Close()
-	s.srv.Wait(ctx)
-
 	s.RLock()
 	s.log.Debugf("Advising reconnect to local site: %s", s.localSite.GetName())
 	go s.localSite.adviseReconnect(ctx)
@@ -625,6 +623,7 @@ func (s *server) DrainConnections(ctx context.Context) error {
 	}
 	s.RUnlock()
 
+	s.srv.Wait(ctx)
 	return trace.Wrap(err)
 }