core: Avoid exception handling in PF for invalid index

ejona86 · ejona86 · commit 4914ffc59aef · 2024-08-21T07:16:29.000-07:00
It is trivial to avoid the exception from
addressIndex.getCurrentAddress(). The log message was inaccurate, as the
subchannel might have been TRANSIENT_FAILURE. The only important part of
the condition was whether the subchannel was the current subchannel.
diff --git a/core/src/main/java/io/grpc/internal/PickFirstLeafLoadBalancer.java b/core/src/main/java/io/grpc/internal/PickFirstLeafLoadBalancer.java
@@ -482,12 +482,9 @@ public void onSubchannelState(ConnectivityStateInfo newState) {
       log.log(Level.FINE, "Received health status {0} for subchannel {1}",
           new Object[]{newState, subchannelData.subchannel});
       subchannelData.healthStateInfo = newState;
-      try {
-        if (subchannelData == subchannels.get(addressIndex.getCurrentAddress())) {
-          updateHealthCheckedState(subchannelData);
-        }
-      } catch (IllegalStateException e) {
-        log.fine("Health listener received state change after subchannel was removed");
+      if (addressIndex.isValid()
+          && subchannelData == subchannels.get(addressIndex.getCurrentAddress())) {
+        updateHealthCheckedState(subchannelData);
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -482,12 +482,9 @@ public void onSubchannelState(ConnectivityStateInfo newState) {`
`482`	`482`	`log.log(Level.FINE, "Received health status {0} for subchannel {1}",`
`483`	`483`	`new Object[]{newState, subchannelData.subchannel});`
`484`	`484`	`subchannelData.healthStateInfo = newState;`
`485`		`- try {`
`486`		`- if (subchannelData == subchannels.get(addressIndex.getCurrentAddress())) {`
`487`		`- updateHealthCheckedState(subchannelData);`
`488`		`- }`
`489`		`- } catch (IllegalStateException e) {`
`490`		`- log.fine("Health listener received state change after subchannel was removed");`
	`485`	`+ if (addressIndex.isValid()`
	`486`	`+ && subchannelData == subchannels.get(addressIndex.getCurrentAddress())) {`
	`487`	`+ updateHealthCheckedState(subchannelData);`
`491`	`488`	`}`
`492`	`489`	`}`
`493`	`490`	`}`