Skip to content

core: Fix NPE during address update with Happy Eyeballs (1.77.x backport) #12470

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

Merged
merged 1 commit into from
Nov 5, 2025
+45 −2
Merged

core: Fix NPE during address update with Happy Eyeballs (1.77.x backport) #12470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 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 @@ -137,9 +137,13 @@ public Status acceptResolvedAddresses(ResolvedAddresses resolvedAddresses) {
final ImmutableList<EquivalentAddressGroup> newImmutableAddressGroups =
ImmutableList.<EquivalentAddressGroup>builder().addAll(cleanServers).build();

if (rawConnectivityState == READY || rawConnectivityState == CONNECTING) {
if (rawConnectivityState == READY
|| (rawConnectivityState == CONNECTING
&& (!enableHappyEyeballs || addressIndex.isValid()))) {
// If the previous ready (or connecting) subchannel exists in new address list,
// keep this connection and don't create new subchannels
// keep this connection and don't create new subchannels. Happy Eyeballs is excluded when
// connecting, because it allows multiple attempts simultaneously, thus is fine to start at
// the beginning.
SocketAddress previousAddress = addressIndex.getCurrentAddress();
addressIndex.updateGroups(newImmutableAddressGroups);
if (addressIndex.seekTo(previousAddress)) {
Expand Down
39 changes: 39 additions & 0 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 @@ -1872,6 +1872,45 @@ public void updateAddresses_identical_transient_failure() {
assertEquals(PickResult.withSubchannel(mockSubchannel1), picker.pickSubchannel(mockArgs));
}

@Test
public void updateAddresses_identicalSingleAddress_connecting() {
// Creating first set of endpoints/addresses
List<EquivalentAddressGroup> oldServers = Lists.newArrayList(servers.get(0));

// Accept Addresses and verify proper connection flow
assertEquals(IDLE, loadBalancer.getConcludedConnectivityState());
loadBalancer.acceptResolvedAddresses(
ResolvedAddresses.newBuilder().setAddresses(oldServers).setAttributes(affinity).build());
verify(mockSubchannel1).start(stateListenerCaptor.capture());
SubchannelStateListener stateListener = stateListenerCaptor.getValue();
assertEquals(CONNECTING, loadBalancer.getConcludedConnectivityState());

// First connection attempt is successful
stateListener.onSubchannelState(ConnectivityStateInfo.forNonError(CONNECTING));
assertEquals(CONNECTING, loadBalancer.getConcludedConnectivityState());
fakeClock.forwardTime(CONNECTION_DELAY_INTERVAL_MS, TimeUnit.MILLISECONDS);

// verify that picker returns no subchannel
verify(mockHelper).updateBalancingState(eq(CONNECTING), pickerCaptor.capture());
SubchannelPicker picker = pickerCaptor.getValue();
assertEquals(PickResult.withNoResult(), picker.pickSubchannel(mockArgs));

// Accept same resolved addresses to update
reset(mockHelper);
loadBalancer.acceptResolvedAddresses(
ResolvedAddresses.newBuilder().setAddresses(oldServers).setAttributes(affinity).build());
fakeClock.forwardTime(CONNECTION_DELAY_INTERVAL_MS, TimeUnit.MILLISECONDS);

// Verify that no new subchannels were created or started
verify(mockSubchannel2, never()).start(any());
assertEquals(CONNECTING, loadBalancer.getConcludedConnectivityState());

// verify that picker hasn't changed via checking mock helper's interactions
verify(mockHelper, atLeast(0)).getSynchronizationContext(); // Don't care
verify(mockHelper, atLeast(0)).getScheduledExecutorService();
verifyNoMoreInteractions(mockHelper);
}

@Test
public void twoAddressesSeriallyConnect() {
// Starting first connection attempt
Expand Down