File tree Expand file tree Collapse file tree 2 files changed +4
-4
lines changed
util/src/main/java/io/grpc/util
xds/src/main/java/io/grpc/xds Expand file tree Collapse file tree 2 files changed +4
-4
lines changed 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
Original file line number Diff line number Diff line change @@ -260,16 +260,16 @@ private class ClusterManagerChildHelper extends ChildLbStateHelper {
260
260
@ Override
261
261
public void updateBalancingState (final ConnectivityState newState ,
262
262
final SubchannelPicker newPicker ) {
263
- // If we are already in the process of resolving addresses, the overall balancing state
264
- // will be updated at the end of it, and we don't need to trigger that update here.
265
- if (getChildLbState (getKey ()) == null ) {
263
+ if (getCurrentState () == ConnectivityState .SHUTDOWN ) {
266
264
return ;
267
265
}
268
266
269
267
// Subchannel picker and state are saved, but will only be propagated to the channel
270
268
// when the child instance exits deactivated state.
271
269
setCurrentState (newState );
272
270
setCurrentPicker (newPicker );
271
+ // If we are already in the process of resolving addresses, the overall balancing state
272
+ // will be updated at the end of it, and we don't need to trigger that update here.
273
273
if (deletionTimer == null && !resolvingAddresses ) {
274
274
updateOverallBalancingState ();
275
275
}
You can’t perform that action at this time.
0 commit comments