balancer/rls, xds/wrrlocality: stop forwarding UpdateSubConnState calls (#6532)

dfawley · web-flow · commit 490069967eb8 · 2023-08-10T12:06:54.000-07:00
diff --git a/balancer/rls/balancer.go b/balancer/rls/balancer.go
@@ -436,7 +436,7 @@ func (b *rlsBalancer) ResolverError(err error) {
 }
 
 func (b *rlsBalancer) UpdateSubConnState(sc balancer.SubConn, state balancer.SubConnState) {
-	b.bg.UpdateSubConnState(sc, state)
+	b.logger.Errorf("UpdateSubConnState(%v, %+v) called unexpectedly", sc, state)
 }
 
 func (b *rlsBalancer) Close() {
diff --git a/xds/internal/balancer/wrrlocality/balancer.go b/xds/internal/balancer/wrrlocality/balancer.go
@@ -192,8 +192,8 @@ func (b *wrrLocalityBalancer) ResolverError(err error) {
 	b.child.ResolverError(err)
 }
 
-func (b *wrrLocalityBalancer) UpdateSubConnState(sc balancer.SubConn, scState balancer.SubConnState) {
-	b.child.UpdateSubConnState(sc, scState)
+func (b *wrrLocalityBalancer) UpdateSubConnState(sc balancer.SubConn, state balancer.SubConnState) {
+	b.logger.Errorf("UpdateSubConnState(%v, %+v) called unexpectedly", sc, state)
 }
 
 func (b *wrrLocalityBalancer) Close() {

Original file line number	Diff line number	Diff line change
`@@ -436,7 +436,7 @@ func (b *rlsBalancer) ResolverError(err error) {`
`436`	`436`	`}`
`437`	`437`
`438`	`438`	`func (b *rlsBalancer) UpdateSubConnState(sc balancer.SubConn, state balancer.SubConnState) {`
`439`		`- b.bg.UpdateSubConnState(sc, state)`
	`439`	`+ b.logger.Errorf("UpdateSubConnState(%v, %+v) called unexpectedly", sc, state)`
`440`	`440`	`}`
`441`	`441`
`442`	`442`	`func (b *rlsBalancer) Close() {`
Original file line number	Diff line number	Diff line change
`@@ -192,8 +192,8 @@ func (b *wrrLocalityBalancer) ResolverError(err error) {`
`192`	`192`	`b.child.ResolverError(err)`
`193`	`193`	`}`
`194`	`194`
`195`		`-func (b *wrrLocalityBalancer) UpdateSubConnState(sc balancer.SubConn, scState balancer.SubConnState) {`
`196`		`- b.child.UpdateSubConnState(sc, scState)`
	`195`	`+func (b *wrrLocalityBalancer) UpdateSubConnState(sc balancer.SubConn, state balancer.SubConnState) {`
	`196`	`+ b.logger.Errorf("UpdateSubConnState(%v, %+v) called unexpectedly", sc, state)`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`func (b *wrrLocalityBalancer) Close() {`