balancer: fix tests not properly updating subconn states #6501
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
|
There seems to be race detected by one of the tests. I haven't looked in detail to figure out whether the race is in the test or in the code. |
easwars
reviewed
Aug 3, 2023
| @@ -1211,7 +1211,11 @@ var errTestInitIdle = fmt.Errorf("init Idle balancer error 0") | |||
| func init() { | |||
| stub.Register(initIdleBalancerName, stub.BalancerFuncs{ | |||
| UpdateClientConnState: func(bd *stub.BalancerData, opts balancer.ClientConnState) error { | |||
| bd.ClientConn.NewSubConn(opts.ResolverState.Addresses, balancer.NewSubConnOptions{}) | |||
| sc, err := bd.ClientConn.NewSubConn(opts.ResolverState.Addresses, balancer.NewSubConnOptions{}) | |||
There was a problem hiding this comment.
Don't we need to set the StateListener here?
| @@ -375,7 +375,11 @@ func (s) TestPickerUpdateAfterClose(t *testing.T) { | |||
| UpdateClientConnState: func(bd *stub.BalancerData, ccs balancer.ClientConnState) error { | |||
| // Create a subConn which will be used later on to test the race | |||
| // between UpdateSubConnState() and Close(). | |||
| bd.ClientConn.NewSubConn(ccs.ResolverState.Addresses, balancer.NewSubConnOptions{}) | |||
| sc, err := bd.ClientConn.NewSubConn(ccs.ResolverState.Addresses, balancer.NewSubConnOptions{}) | |||
There was a problem hiding this comment.
And here, with the StateListener?
| @@ -1746,7 +1746,11 @@ func init() { | |||
| ii := i | |||
| stub.Register(fmt.Sprintf("%s-%d", initIdleBalancerName, ii), stub.BalancerFuncs{ | |||
| UpdateClientConnState: func(bd *stub.BalancerData, opts balancer.ClientConnState) error { | |||
| bd.ClientConn.NewSubConn(opts.ResolverState.Addresses, balancer.NewSubConnOptions{}) | |||
| sc, err := bd.ClientConn.NewSubConn(opts.ResolverState.Addresses, balancer.NewSubConnOptions{}) | |||
| @@ -582,7 +582,11 @@ var errTestInitIdle = fmt.Errorf("init Idle balancer error 0") | |||
| func init() { | |||
| stub.Register(initIdleBalancerName, stub.BalancerFuncs{ | |||
| UpdateClientConnState: func(bd *stub.BalancerData, opts balancer.ClientConnState) error { | |||
| bd.ClientConn.NewSubConn(opts.ResolverState.Addresses, balancer.NewSubConnOptions{}) | |||
| sc, err := bd.ClientConn.NewSubConn(opts.ResolverState.Addresses, balancer.NewSubConnOptions{}) | |||
|
For all of these, I'm trying to avoid changing everything in a single PR. It quickly becomes a gigantic change otherwise. |
Ack. |
easwars
approved these changes
Aug 3, 2023
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.
Simple cleanup using
sedto rewriteUpdateSubConnStateintoTestSubConn.UpdateStatecalls, which will ensure theStateListeneris called if one is registered.RELEASE NOTES: none