test: update client state subscriber test to be not flaky and more stressful about rapid updates #6512
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ressful about rapid updates
easwars
previously approved these changes
Aug 8, 2023
easwars
reviewed
Aug 9, 2023
clientconn.go
Outdated
| @@ -1234,6 +1230,7 @@ func (cc *ClientConn) ResetConnectBackoff() { | |||
|
|
|||
| // Close tears down the ClientConn and all underlying connections. | |||
| func (cc *ClientConn) Close() error { | |||
| defer func() { <-cc.csMgr.pubSub.Done() }() | |||
There was a problem hiding this comment.
This is now executed outside of cc.mu. Was that intentional?
There was a problem hiding this comment.
Yes. cc.cancel() needs to happen or else pubSub.Done() will never close. And csMgr isn't protected by cc.mu so it should be fine.
There was a problem hiding this comment.
Optional: Maybe a single defer instead of two? Even when we know that deferred funcs are executed LIFO, this is easier to read than having two defers I feel.
defer func() {
cc.cancel()
<-cc.csMgr.pubSub.Done()
}()
easwars
approved these changes
Aug 10, 2023
clientconn.go
Outdated
| @@ -1234,6 +1230,7 @@ func (cc *ClientConn) ResetConnectBackoff() { | |||
|
|
|||
| // Close tears down the ClientConn and all underlying connections. | |||
| func (cc *ClientConn) Close() error { | |||
| defer func() { <-cc.csMgr.pubSub.Done() }() | |||
There was a problem hiding this comment.
Optional: Maybe a single defer instead of two? Even when we know that deferred funcs are executed LIFO, this is easier to read than having two defers I feel.
defer func() {
cc.cancel()
<-cc.csMgr.pubSub.Done()
}()
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
RELEASE NOTES: none