flasn4nt
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

core:Change address deduping to be across EAGs (#11345) 

* Change dedup to be cross EAG, not just within an EAG
This commit is contained in:
Larry Safran 2024-06-28 14:58:50 -07:00 committed by GitHub
parent 9e2145970a
commit 0b68eff120
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 50 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
core/src/main/java/io/grpc/internal/PickFirstLeafLoadBalancer.java
View File

@ -91,9 +91,6 @@ final class PickFirstLeafLoadBalancer extends LoadBalancer {
handleNameResolutionError(unavailableStatus);
return unavailableStatus;
}
List<EquivalentAddressGroup> cleanServers = new ArrayList<>();
for (EquivalentAddressGroup eag : servers) {
if (eag == null) {
Status unavailableStatus = Status.UNAVAILABLE.withDescription(
@ -103,12 +100,13 @@ final class PickFirstLeafLoadBalancer extends LoadBalancer {
handleNameResolutionError(unavailableStatus);
return unavailableStatus;
}
cleanServers.add(removeDuplicateAddresses(eag));
}
// Since we have a new set of addresses, we are again at first pass
firstPass = true;
List<EquivalentAddressGroup> cleanServers = deDupAddresses(servers);
// We can optionally be configured to shuffle the address list. This can help better distribute
// the load.
if (resolvedAddresses.getLoadBalancingPolicyConfig()
@ -121,7 +119,6 @@ final class PickFirstLeafLoadBalancer extends LoadBalancer {
}
}
// Make sure we're storing our own list rather than what was passed in
final ImmutableList<EquivalentAddressGroup> newImmutableAddressGroups =
ImmutableList.<EquivalentAddressGroup>builder().addAll(cleanServers).build();
@ -181,21 +178,23 @@ final class PickFirstLeafLoadBalancer extends LoadBalancer {
return Status.OK;
}
private static EquivalentAddressGroup removeDuplicateAddresses(EquivalentAddressGroup eag) {
Set<SocketAddress> addressSet = new HashSet<>();
ArrayList<SocketAddress> addrs = new ArrayList<>(); // maintains order
private static List<EquivalentAddressGroup> deDupAddresses(List<EquivalentAddressGroup> groups) {
Set<SocketAddress> seenAddresses = new HashSet<>();
List<EquivalentAddressGroup> newGroups = new ArrayList<>();
for (SocketAddress address : eag.getAddresses()) {
if (addressSet.add(address)) {
addrs.add(address);
for (EquivalentAddressGroup group : groups) {
List<SocketAddress> addrs = new ArrayList<>();
for (SocketAddress addr : group.getAddresses()) {
if (seenAddresses.add(addr)) {
addrs.add(addr);
}
}
if (!addrs.isEmpty()) {
newGroups.add(new EquivalentAddressGroup(addrs, group.getAttributes()));
}
}
if (addressSet.size() == eag.getAddresses().size()) {
return eag;
}
return new EquivalentAddressGroup(addrs, eag.getAttributes());
return newGroups;
}
@Override

7
core/src/main/java/io/grpc/internal/PickFirstLoadBalancerProvider.java
View File

@ -36,7 +36,7 @@ public final class PickFirstLoadBalancerProvider extends LoadBalancerProvider {
public static final String GRPC_PF_USE_HAPPY_EYEBALLS = "GRPC_PF_USE_HAPPY_EYEBALLS";
private static final String SHUFFLE_ADDRESS_LIST_KEY = "shuffleAddressList";
static boolean enableNewPickFirst =
private static boolean enableNewPickFirst =
GrpcUtil.getFlag("GRPC_EXPERIMENTAL_ENABLE_NEW_PICK_FIRST", false);
public static boolean isEnabledHappyEyeballs() {
@ -44,11 +44,6 @@ public final class PickFirstLoadBalancerProvider extends LoadBalancerProvider {
return GrpcUtil.getFlag(GRPC_PF_USE_HAPPY_EYEBALLS, false);
}
@VisibleForTesting
public static boolean isEnableNewPickFirst() {
return enableNewPickFirst;
}
@Override
public boolean isAvailable() {
return true;

2
core/src/test/java/io/grpc/internal/AutoConfiguredLoadBalancerFactoryTest.java
View File

@ -99,7 +99,7 @@ public class AutoConfiguredLoadBalancerFactoryTest {
new FakeLoadBalancerProvider("test_lb2", testLbBalancer2, nextParsedConfigOrError2)));
private final Class<? extends LoadBalancer> pfLbClass =
PickFirstLoadBalancerProvider.enableNewPickFirst
PickFirstLoadBalancerProvider.isEnabledNewPickFirst()
? PickFirstLeafLoadBalancer.class
: PickFirstLoadBalancer.class;

34
core/src/test/java/io/grpc/internal/PickFirstLeafLoadBalancerTest.java
View File

@ -565,7 +565,7 @@ public class PickFirstLeafLoadBalancerTest {
}
@Test
public void pickAWithDupAddressesUpDownUp() {
public void pickWithDupAddressesUpDownUp() {
InOrder inOrder = inOrder(mockHelper);
SocketAddress socketAddress = servers.get(0).getAddresses().get(0);
EquivalentAddressGroup badEag = new EquivalentAddressGroup(
@ -599,6 +599,38 @@ public class PickFirstLeafLoadBalancerTest {
assertEquals(Status.OK, pickerCaptor.getValue().pickSubchannel(mockArgs).getStatus());
}
@Test
public void pickWithDupEagsUpDownUp() {
InOrder inOrder = inOrder(mockHelper);
List<EquivalentAddressGroup> newServers = Lists.newArrayList(servers.get(0), servers.get(0));
loadBalancer.acceptResolvedAddresses(
ResolvedAddresses.newBuilder().setAddresses(newServers).setAttributes(affinity).build());
verify(mockHelper).updateBalancingState(eq(CONNECTING), pickerCaptor.capture());
verify(mockHelper).createSubchannel(createArgsCaptor.capture());
verify(mockSubchannel1).start(stateListenerCaptor.capture());
SubchannelStateListener stateListener = stateListenerCaptor.getValue();
reset(mockHelper);
// An error has happened.
Status error = Status.UNAVAILABLE.withDescription("boom!");
stateListener.onSubchannelState(ConnectivityStateInfo.forTransientFailure(error));
inOrder.verify(mockHelper).updateBalancingState(eq(TRANSIENT_FAILURE), pickerCaptor.capture());
inOrder.verify(mockHelper).refreshNameResolution();
assertEquals(error, pickerCaptor.getValue().pickSubchannel(mockArgs).getStatus());
// Transition from TRANSIENT_ERROR to CONNECTING should also be ignored.
stateListener.onSubchannelState(ConnectivityStateInfo.forNonError(CONNECTING));
verifyNoMoreInteractions(mockHelper);
assertEquals(error, pickerCaptor.getValue().pickSubchannel(mockArgs).getStatus());
// Transition from CONNECTING to READY .
stateListener.onSubchannelState(ConnectivityStateInfo.forNonError(READY));
inOrder.verify(mockHelper).updateBalancingState(eq(READY), pickerCaptor.capture());
assertEquals(Status.OK, pickerCaptor.getValue().pickSubchannel(mockArgs).getStatus());
}
@Test
public void nameResolutionError() {
Status error = Status.NOT_FOUND.withDescription("nameResolutionError");