Skip to content

[v10] Drain errChan in api.client/connect #17159

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

Merged
espadolini merged 1 commit into from
Oct 7, 2022
Merged

[v10] Drain errChan in api.client/connect #17159

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions api/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,18 +262,22 @@ func connect(ctx context.Context, cfg Config) (*Client, error) {
}()

var errs []error
for errChan != nil {
Outer:
for {
select {
// Use the first client to successfully connect in syncConnect.
case clt := <-cltChan:
go func() {
for range errChan {
}
}()
return clt, nil
case err, ok := <-errChan:
if ok {
// Add a new line to make errs human readable.
errs = append(errs, trace.Wrap(err, ""))
continue
if !ok {
break Outer
}
errChan = nil
// Add a new line to make errs human readable.
errs = append(errs, trace.Wrap(err, ""))
}
}

Expand Down