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.

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

Backport of Fix panicky xDS test flakes into release/1.15.x #16310

Merged
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions agent/xds/testing.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ type TestEnvoy struct {
EnvoyVersion string

deltaStream *TestADSDeltaStream // Incremental v3

closed bool
}

// NewTestEnvoy creates a TestEnvoy instance.
Expand Down Expand Up @@ -225,9 +227,9 @@ func (e *TestEnvoy) Close() error {
defer e.mu.Unlock()

// unblock the recv chans to simulate recv errors when client disconnects
if e.deltaStream != nil && e.deltaStream.recvCh != nil {
if !e.closed && e.deltaStream.recvCh != nil {
close(e.deltaStream.recvCh)
e.deltaStream = nil
e.closed = true
}
if e.cancel != nil {
e.cancel()
Expand Down