Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[v12] Send tunnel reconnects before waiting for sessions to drain #24141

Merged
merged 2 commits into from Apr 5, 2023
Merged

[v12] Send tunnel reconnects before waiting for sessions to drain #24141

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7f9f7d
Send tunnel reconnects before waiting for sessions to drain
dboslee Apr 4, 2023
66ff433
Merge branch 'branch/v12' into bot/backport-24090-branch/v12
dboslee Apr 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions lib/reversetunnel/srv.go
View file
Open in desktop
Expand Up @@ -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)
Expand All @@ -625,6 +623,7 @@ func (s *server) DrainConnections(ctx context.Context) error {
}
s.RUnlock()

s.srv.Wait(ctx)
return trace.Wrap(err)
}

Expand Down