core: In PF, remove useless requestConnection for CONNECTING subchannel

ejona86 · ejona86 · commit 82a8d5739696 · 2024-08-21T07:16:29.000-07:00
It doesn't do anything.

Call scheduleNextConnection() unconditionally since it is responsible
for checking if `enableHappyEyeballs == true`. It's also surprising to
check in the CONNECTING case but not the IDLE case.
diff --git a/core/src/main/java/io/grpc/internal/PickFirstLeafLoadBalancer.java b/core/src/main/java/io/grpc/internal/PickFirstLeafLoadBalancer.java
@@ -385,11 +385,7 @@ public void requestConnection() {
         scheduleNextConnection();
         break;
       case CONNECTING:
-        if (enableHappyEyeballs) {
-          scheduleNextConnection();
-        } else {
-          subchannelData.subchannel.requestConnection();
-        }
+        scheduleNextConnection();
         break;
       case TRANSIENT_FAILURE:
         addressIndex.increment();
diff --git a/core/src/test/java/io/grpc/internal/PickFirstLeafLoadBalancerTest.java b/core/src/test/java/io/grpc/internal/PickFirstLeafLoadBalancerTest.java
@@ -361,11 +361,7 @@ public void pickAfterResolvedAndUnchanged() {
     // Second acceptResolvedAddresses shouldn't do anything
     loadBalancer.acceptResolvedAddresses(
         ResolvedAddresses.newBuilder().setAddresses(servers).setAttributes(affinity).build());
-    if (enableHappyEyeballs) {
-      inOrder.verify(mockSubchannel1, never()).requestConnection();
-    } else {
-      inOrder.verify(mockSubchannel1, times(1)).requestConnection();
-    }
+    inOrder.verify(mockSubchannel1, never()).requestConnection();
     inOrder.verify(mockHelper, never()).updateBalancingState(any(), any());
   }
 
@@ -862,20 +858,15 @@ public void requestConnection() {
     loadBalancer.requestConnection();
     inOrder.verify(mockSubchannel2).start(stateListenerCaptor.capture());
     SubchannelStateListener stateListener2 = stateListenerCaptor.getValue();
-    int expectedRequests = enableHappyEyeballs ? 1 : 2;
-    inOrder.verify(mockSubchannel2, times(expectedRequests)).requestConnection();
+    inOrder.verify(mockSubchannel2).requestConnection();
 
     stateListener2.onSubchannelState(ConnectivityStateInfo.forNonError(CONNECTING));
 
     // calling requestConnection is now a no-op
     loadBalancer.requestConnection();
     inOrder.verify(mockHelper, never()).updateBalancingState(any(), any());
     inOrder.verify(mockSubchannel1, never()).requestConnection();
-    if (enableHappyEyeballs) {
-      inOrder.verify(mockSubchannel2, never()).requestConnection();
-    } else {
-      inOrder.verify(mockSubchannel2).requestConnection();
-    }
+    inOrder.verify(mockSubchannel2, never()).requestConnection();
   }
 
   @Test
