src code

Author: shivaspeaks

core/src/main/java/io/grpc/internal/PickFirstLeafLoadBalancer.java

@@ -449,11 +449,7 @@ private void shutdownRemaining(SubchannelData activeSubchannelData) {
    */
   @Override
   public void requestConnection() {
-    // Immediately transition to CONNECTING if we are currently IDLE.
-    if (rawConnectivityState == IDLE) {
-      rawConnectivityState = CONNECTING;
-      updateBalancingState(CONNECTING, new Picker(PickResult.withNoResult()));
-    }
+    boolean wasIdle = rawConnectivityState == IDLE;
     if (!addressIndex.isValid() || rawConnectivityState == SHUTDOWN) {
       return;
     }
@@ -469,6 +465,10 @@ public void requestConnection() {
       case IDLE:
         subchannelData.subchannel.requestConnection();
         subchannelData.updateState(CONNECTING);
+        if (wasIdle) {
+          rawConnectivityState = CONNECTING;
+          updateBalancingState(CONNECTING, new Picker(PickResult.withNoResult()));
+        }
         scheduleNextConnection();
         break;
       case CONNECTING:

core/src/test/java/io/grpc/internal/PickFirstLeafLoadBalancerTest.java

@@ -2461,7 +2461,7 @@ public void happy_eyeballs_pick_pushes_index_over_end() {
     PickResult pickResult = requestingPicker.pickSubchannel(mockArgs);
     assertEquals("RequestConnectionPicker", requestingPicker.getClass().getSimpleName());
     assertEquals(PickResult.withNoResult(), pickResult);
-    assertEquals(IDLE, loadBalancer.getConcludedConnectivityState());
+    assertEquals(CONNECTING, loadBalancer.getConcludedConnectivityState());
 
     // Second pick moves index to addr 3
     pickResult = requestingPicker.pickSubchannel(mockArgs);
@@ -2496,7 +2496,7 @@ public void happy_eyeballs_pick_pushes_index_over_end() {
       pickResult = requestingPicker2.pickSubchannel(mockArgs);
       assertEquals(PickResult.withNoResult(), pickResult);
     }
-    assertEquals(IDLE, loadBalancer.getConcludedConnectivityState());
+    assertEquals(CONNECTING, loadBalancer.getConcludedConnectivityState());
 
     listeners[0].onSubchannelState(ConnectivityStateInfo.forTransientFailure(error));
     inOrder.verify(mockSubchannel2n2).start(stateListenerCaptor.capture());