Skip to content

core: avoid getting stuck in IDLE on connection breakage #12403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

core: avoid getting stuck in IDLE on connection breakage #12403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a292e84
src code
shivaspeaks Oct 6, 2025
54e6b5a
src code
shivaspeaks Oct 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions core/src/main/java/io/grpc/internal/PickFirstLeafLoadBalancer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,7 @@ private void shutdownRemaining(SubchannelData activeSubchannelData) {
*/
@Override
public void requestConnection() {
boolean wasIdle = rawConnectivityState == IDLE;
if (!addressIndex.isValid() || rawConnectivityState == SHUTDOWN) {
return;
}
Expand All @@ -464,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:
Expand Down
4 changes: 2 additions & 2 deletions core/src/test/java/io/grpc/internal/PickFirstLeafLoadBalancerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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());
Expand Down
Loading