xds/priority: stop forwarding UpdateSubConnState calls (grpc#6521)

arjan-bal · Aug 9, 2023 · ce68413 · ce68413
1 parent dceb6ee
commit ce68413
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/xds/internal/balancer/priority/balancer.go b/xds/internal/balancer/priority/balancer.go
@@ -200,7 +200,7 @@ func (b *priorityBalancer) ResolverError(err error) {
 }
 
 func (b *priorityBalancer) UpdateSubConnState(sc balancer.SubConn, state balancer.SubConnState) {
-	b.bg.UpdateSubConnState(sc, state)
+	b.logger.Errorf("UpdateSubConnState(%v, %+v) called unexpectedly", sc, state)
 }
 
 func (b *priorityBalancer) Close() {

diff --git a/xds/internal/balancer/priority/balancer_test.go b/xds/internal/balancer/priority/balancer_test.go
@@ -1736,7 +1736,18 @@ func init() {
 		ii := i
 		stub.Register(fmt.Sprintf("%s-%d", initIdleBalancerName, ii), stub.BalancerFuncs{
 			UpdateClientConnState: func(bd *stub.BalancerData, opts balancer.ClientConnState) error {
-				sc, err := bd.ClientConn.NewSubConn(opts.ResolverState.Addresses, balancer.NewSubConnOptions{})
+				lis := func(state balancer.SubConnState) {
+					err := fmt.Errorf("wrong picker error")
+					if state.ConnectivityState == connectivity.Idle {
+						err = errsTestInitIdle[ii]
+					}
+					bd.ClientConn.UpdateState(balancer.State{
+						ConnectivityState: state.ConnectivityState,
+						Picker:            &testutils.TestConstPicker{Err: err},
+					})
+				}
+
+				sc, err := bd.ClientConn.NewSubConn(opts.ResolverState.Addresses, balancer.NewSubConnOptions{StateListener: lis})
 				if err != nil {
 					return err
 				}
@@ -1747,16 +1758,6 @@ func init() {
 				})
 				return nil
 			},
-			UpdateSubConnState: func(bd *stub.BalancerData, sc balancer.SubConn, state balancer.SubConnState) {
-				err := fmt.Errorf("wrong picker error")
-				if state.ConnectivityState == connectivity.Idle {
-					err = errsTestInitIdle[ii]
-				}
-				bd.ClientConn.UpdateState(balancer.State{
-					ConnectivityState: state.ConnectivityState,
-					Picker:            &testutils.TestConstPicker{Err: err},
-				})
-			},
 		})
 	}
 }