util: Remove minor convenience functions from MultiChildLB

ejona86 · ejona86 · commit 909c4bc382c6 · 2024-08-13T21:29:08.000-07:00
These were once needed to be overridden (e.g., by RoundRobinLB), but
now nothing overrides them and MultiChildLB doesn't even call one of
them.
diff --git a/util/src/main/java/io/grpc/util/MultiChildLoadBalancer.java b/util/src/main/java/io/grpc/util/MultiChildLoadBalancer.java
@@ -173,28 +173,11 @@ protected ResolvedAddresses getChildAddresses(Object key, ResolvedAddresses reso
   @Override
   public void handleNameResolutionError(Status error) {
     if (currentConnectivityState != READY)  {
-      helper.updateBalancingState(TRANSIENT_FAILURE, getErrorPicker(error));
+      helper.updateBalancingState(
+          TRANSIENT_FAILURE, new FixedResultPicker(PickResult.withError(error)));
     }
   }
 
-  /**
-   * Handle the name resolution error only for the specified child.
-   *
-   * <p/>Override if you need special handling.
-   */
-  protected void handleNameResolutionError(ChildLbState child, Status error) {
-    child.lb.handleNameResolutionError(error);
-  }
-
-  /**
-   * Creates a new picker representing an error status.
-   *
-   * <p/>Override to produce a custom picker when there are errors.
-   */
-  protected SubchannelPicker getErrorPicker(Status error)  {
-    return new FixedResultPicker(PickResult.withError(error));
-  }
-
   @Override
   public void shutdown() {
     logger.log(Level.FINE, "Shutdown");
diff --git a/xds/src/main/java/io/grpc/xds/ClusterManagerLoadBalancer.java b/xds/src/main/java/io/grpc/xds/ClusterManagerLoadBalancer.java
@@ -183,11 +183,12 @@ public void handleNameResolutionError(Status error) {
     for (ChildLbState state : getChildLbStates()) {
       if (((ClusterManagerLbState) state).deletionTimer == null) {
         gotoTransientFailure = false;
-        handleNameResolutionError(state, error);
+        state.getLb().handleNameResolutionError(error);
       }
     }
     if (gotoTransientFailure) {
-      getHelper().updateBalancingState(TRANSIENT_FAILURE, getErrorPicker(error));
+      getHelper().updateBalancingState(
+          TRANSIENT_FAILURE, new FixedResultPicker(PickResult.withError(error)));
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -183,11 +183,12 @@ public void handleNameResolutionError(Status error) {`
`183`	`183`	`for (ChildLbState state : getChildLbStates()) {`
`184`	`184`	`if (((ClusterManagerLbState) state).deletionTimer == null) {`
`185`	`185`	`gotoTransientFailure = false;`
`186`		`- handleNameResolutionError(state, error);`
	`186`	`+ state.getLb().handleNameResolutionError(error);`
`187`	`187`	`}`
`188`	`188`	`}`
`189`	`189`	`if (gotoTransientFailure) {`
`190`		`- getHelper().updateBalancingState(TRANSIENT_FAILURE, getErrorPicker(error));`
	`190`	`+ getHelper().updateBalancingState(`
	`191`	`+ TRANSIENT_FAILURE, new FixedResultPicker(PickResult.withError(error)));`
`191`	`192`	`}`
`192`	`193`	`}`
`193`	`194`