opensource/grpc-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

only force update picker when cache is used (sub-balancer is round-robin) (#2843)

Browse Source
This commit is contained in:
Menghan Li
2019-06-03 10:43:53 -07:00
committed by GitHub
parent 99aff99e53
commit 532a0b98cb
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
balancer/grpclb/grpclb_remote_balancer.go
View File

@ -95,14 +95,6 @@ func (lb *lbBalancer) processServerList(l *lbpb.ServerList) {
// //
// Caller must hold lb.mu. // Caller must hold lb.mu.
func (lb *lbBalancer) refreshSubConns(backendAddrs []resolver.Address, fallback bool, pickFirst bool) { func (lb *lbBalancer) refreshSubConns(backendAddrs []resolver.Address, fallback bool, pickFirst bool) {
defer func() {
// Regenerate and update picker after refreshing subconns because with
// cache, even if SubConn was newed/removed, there might be no state
// changes (the subconn will be kept in cache, not actually
// newed/removed).
lb.updateStateAndPicker(true, true)
}()
lb.inFallback = fallback lb.inFallback = fallback
opts := balancer.NewSubConnOptions{} opts := balancer.NewSubConnOptions{}
@ -184,6 +176,12 @@ func (lb *lbBalancer) refreshSubConns(backendAddrs []resolver.Address, fallback
// The entry will be deleted in HandleSubConnStateChange. // The entry will be deleted in HandleSubConnStateChange.
} }
} }
// Regenerate and update picker after refreshing subconns because with
// cache, even if SubConn was newed/removed, there might be no state
// changes (the subconn will be kept in cache, not actually
// newed/removed).
lb.updateStateAndPicker(true, true)
} }
func (lb *lbBalancer) readServerList(s *balanceLoadClientStream) error { func (lb *lbBalancer) readServerList(s *balanceLoadClientStream) error {