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

* backport of commit 01ca6e268b

* backport of commit 485cb4d88d

---------

Co-authored-by: Andrew Stucki <andrew.stucki@hashicorp.com>
pull/16306/head^2
hc-github-team-consul-core 2023-02-17 14:24:01 -05:00 committed by GitHub
parent 94f4347ffe
commit 3cba165d78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions

View File

@ -85,6 +85,8 @@ type TestEnvoy struct {
EnvoyVersion string
deltaStream *TestADSDeltaStream // Incremental v3
closed bool
}
// NewTestEnvoy creates a TestEnvoy instance.
@ -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()