From 490069967eb8d2f740c2b1cac8b075aee70f8820 Mon Sep 17 00:00:00 2001
From: Doug Fawley <dfawley@google.com>
Date: Thu, 10 Aug 2023 12:06:54 -0700
Subject: [PATCH] balancer/rls, xds/wrrlocality: stop forwarding
 UpdateSubConnState calls (#6532)

---
 balancer/rls/balancer.go                      | 2 +-
 xds/internal/balancer/wrrlocality/balancer.go | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/balancer/rls/balancer.go b/balancer/rls/balancer.go
index 076aae8c99f0..6a8c0dd330d6 100644
--- 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
index 4df2e4ed0086..7886d2253581 100644
--- 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() {