Fix panics on balancer and resolver updates #1684
Merged
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
- NewAddress with empty list - NewServiceConfig to switch balancer before the first balancer is built
menghanl
force-pushed
the
panic_resolver_updates
branch
from
fd11f22
to
59305d4
Compare
dfawley
reviewed
Nov 22, 2017
| @@ -183,6 +184,9 @@ func (ccb *ccBalancerWrapper) handleResolvedAddrs(addrs []resolver.Address, err | |||
| } | |||
|
|
|||
| func (ccb *ccBalancerWrapper) NewSubConn(addrs []resolver.Address, opts balancer.NewSubConnOptions) (balancer.SubConn, error) { | |||
| if len(addrs) <= 0 { | |||
| return nil, fmt.Errorf("grpc: cannot create SubConn with empty address list") | |||
There was a problem hiding this comment.
Should we try to make NewSubConn([]) do the same thing that sc := NewSubConn([foo]); sc.UpdateAddresses([]) would do, for consistency?
clientconn_test.go
Outdated
| // makes sure we don't call close on nil balancerWrapper. | ||
| r.NewServiceConfig(`{"loadBalancingPolicy": "round_robin"}`) // This should not panic. | ||
|
|
||
| time.Sleep(time.Second) //Sleep to make sure the service config is handled by ClientConn. |
dfawley
changed the title
dfawley
approved these changes
Nov 22, 2017
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.
updates #1683
This makes NewSubConn() with empty list return an error, and makes UpdateAddress() with empty list tear the addrConn down. The SubConn won't be usable after this.
Eventually we want to make the SubConn with empty address list stay in TransientFailure but still usable, and balancer still can update this SubConn's address. This will be done in a follow-up PR.