util: MultiChildLB children know if they are active

ejona86 · ejona86 · commit 4cb646519412 · 2024-08-29T08:05:16.000-07:00
No need to look up in the map to see if they are still a child.
diff --git a/util/src/main/java/io/grpc/util/MultiChildLoadBalancer.java b/util/src/main/java/io/grpc/util/MultiChildLoadBalancer.java
@@ -414,7 +414,7 @@ protected class ChildLbStateHelper extends ForwardingLoadBalancerHelper {
       @Override
       public void updateBalancingState(final ConnectivityState newState,
           final SubchannelPicker newPicker) {
-        if (!childLbStates.containsKey(key)) {
+        if (currentState == SHUTDOWN) {
           return;
         }
 
diff --git a/xds/src/main/java/io/grpc/xds/ClusterManagerLoadBalancer.java b/xds/src/main/java/io/grpc/xds/ClusterManagerLoadBalancer.java
@@ -260,16 +260,16 @@ private class ClusterManagerChildHelper extends ChildLbStateHelper {
       @Override
       public void updateBalancingState(final ConnectivityState newState,
                                        final SubchannelPicker newPicker) {
-        // If we are already in the process of resolving addresses, the overall balancing state
-        // will be updated at the end of it, and we don't need to trigger that update here.
-        if (getChildLbState(getKey()) == null) {
+        if (getCurrentState() == ConnectivityState.SHUTDOWN) {
           return;
         }
 
         // Subchannel picker and state are saved, but will only be propagated to the channel
         // when the child instance exits deactivated state.
         setCurrentState(newState);
         setCurrentPicker(newPicker);
+        // If we are already in the process of resolving addresses, the overall balancing state
+        // will be updated at the end of it, and we don't need to trigger that update here.
         if (deletionTimer == null && !resolvingAddresses) {
           updateOverallBalancingState();
         }

Original file line number	Diff line number	Diff line change
`@@ -414,7 +414,7 @@ protected class ChildLbStateHelper extends ForwardingLoadBalancerHelper {`
`414`	`414`	`@Override`
`415`	`415`	`public void updateBalancingState(final ConnectivityState newState,`
`416`	`416`	`final SubchannelPicker newPicker) {`
`417`		`- if (!childLbStates.containsKey(key)) {`
	`417`	`+ if (currentState == SHUTDOWN) {`
`418`	`418`	`return;`
`419`	`419`	`}`
`420`	`420`