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

util: Replace RR.EmptyPicker with FixedResultPicker

This commit is contained in:
Eric Anderson 2024-07-25 13:28:49 -07:00
parent 6c9f92a725
commit f20167d602
2 changed files with 15 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
util/src/main/java/io/grpc/util/RoundRobinLoadBalancer.java
View File

@ -42,7 +42,7 @@ import java.util.concurrent.atomic.AtomicInteger;
*/ */
final class RoundRobinLoadBalancer extends MultiChildLoadBalancer { final class RoundRobinLoadBalancer extends MultiChildLoadBalancer {
private final AtomicInteger sequence = new AtomicInteger(new Random().nextInt()); private final AtomicInteger sequence = new AtomicInteger(new Random().nextInt());
private SubchannelPicker currentPicker = new EmptyPicker(); private SubchannelPicker currentPicker = new FixedResultPicker(PickResult.withNoResult());
public RoundRobinLoadBalancer(Helper helper) { public RoundRobinLoadBalancer(Helper helper) {
super(helper); super(helper);
@ -68,7 +68,7 @@ final class RoundRobinLoadBalancer extends MultiChildLoadBalancer {
} }
if (isConnecting) { if (isConnecting) {
updateBalancingState(CONNECTING, new EmptyPicker()); updateBalancingState(CONNECTING, new FixedResultPicker(PickResult.withNoResult()));
} else { } else {
updateBalancingState(TRANSIENT_FAILURE, createReadyPicker(getChildLbStates())); updateBalancingState(TRANSIENT_FAILURE, createReadyPicker(getChildLbStates()));
} }
@ -180,22 +180,4 @@ final class RoundRobinLoadBalancer extends MultiChildLoadBalancer {
&& new HashSet<>(subchannelPickers).containsAll(other.subchannelPickers); && new HashSet<>(subchannelPickers).containsAll(other.subchannelPickers);
} }
} }
@VisibleForTesting
static final class EmptyPicker extends SubchannelPicker {
@Override
public PickResult pickSubchannel(PickSubchannelArgs args) {
return PickResult.withNoResult();
}
@Override
public int hashCode() {
return getClass().hashCode();
}
@Override
public boolean equals(Object o) {
return o instanceof EmptyPicker;
}
}
} }

23
util/src/test/java/io/grpc/util/RoundRobinLoadBalancerTest.java
View File

@ -46,7 +46,9 @@ import io.grpc.ConnectivityStateInfo;
import io.grpc.EquivalentAddressGroup; import io.grpc.EquivalentAddressGroup;
import io.grpc.LoadBalancer; import io.grpc.LoadBalancer;
import io.grpc.LoadBalancer.CreateSubchannelArgs; import io.grpc.LoadBalancer.CreateSubchannelArgs;
import io.grpc.LoadBalancer.FixedResultPicker;
import io.grpc.LoadBalancer.Helper; import io.grpc.LoadBalancer.Helper;
import io.grpc.LoadBalancer.PickResult;
import io.grpc.LoadBalancer.PickSubchannelArgs; import io.grpc.LoadBalancer.PickSubchannelArgs;
import io.grpc.LoadBalancer.ResolvedAddresses; import io.grpc.LoadBalancer.ResolvedAddresses;
import io.grpc.LoadBalancer.Subchannel; import io.grpc.LoadBalancer.Subchannel;
@ -54,7 +56,6 @@ import io.grpc.LoadBalancer.SubchannelPicker;
import io.grpc.Status; import io.grpc.Status;
import io.grpc.internal.TestUtils; import io.grpc.internal.TestUtils;
import io.grpc.util.MultiChildLoadBalancer.ChildLbState; import io.grpc.util.MultiChildLoadBalancer.ChildLbState;
import io.grpc.util.RoundRobinLoadBalancer.EmptyPicker;
import io.grpc.util.RoundRobinLoadBalancer.ReadyPicker; import io.grpc.util.RoundRobinLoadBalancer.ReadyPicker;
import java.net.SocketAddress; import java.net.SocketAddress;
import java.util.ArrayList; import java.util.ArrayList;
@ -84,6 +85,8 @@ import org.mockito.junit.MockitoRule;
@RunWith(JUnit4.class) @RunWith(JUnit4.class)
public class RoundRobinLoadBalancerTest { public class RoundRobinLoadBalancerTest {
private static final Attributes.Key<String> MAJOR_KEY = Attributes.Key.create("major-key"); private static final Attributes.Key<String> MAJOR_KEY = Attributes.Key.create("major-key");
private static final SubchannelPicker EMPTY_PICKER =
new FixedResultPicker(PickResult.withNoResult());
@Rule public final MockitoRule mocks = MockitoJUnit.rule(); @Rule public final MockitoRule mocks = MockitoJUnit.rule();
@ -248,7 +251,7 @@ public class RoundRobinLoadBalancerTest {
ChildLbState childLbState = loadBalancer.getChildLbStates().iterator().next(); ChildLbState childLbState = loadBalancer.getChildLbStates().iterator().next();
Subchannel subchannel = subchannels.get(Arrays.asList(childLbState.getEag())); Subchannel subchannel = subchannels.get(Arrays.asList(childLbState.getEag()));
inOrder.verify(mockHelper).updateBalancingState(eq(CONNECTING), isA(EmptyPicker.class)); inOrder.verify(mockHelper).updateBalancingState(eq(CONNECTING), eq(EMPTY_PICKER));
assertThat(childLbState.getCurrentState()).isEqualTo(CONNECTING); assertThat(childLbState.getCurrentState()).isEqualTo(CONNECTING);
deliverSubchannelState(subchannel, ConnectivityStateInfo.forNonError(READY)); deliverSubchannelState(subchannel, ConnectivityStateInfo.forNonError(READY));
@ -261,7 +264,7 @@ public class RoundRobinLoadBalancerTest {
ConnectivityStateInfo.forTransientFailure(error)); ConnectivityStateInfo.forTransientFailure(error));
assertThat(childLbState.getCurrentState()).isEqualTo(TRANSIENT_FAILURE); assertThat(childLbState.getCurrentState()).isEqualTo(TRANSIENT_FAILURE);
AbstractTestHelper.refreshInvokedAndUpdateBS(inOrder, CONNECTING, mockHelper, pickerCaptor); AbstractTestHelper.refreshInvokedAndUpdateBS(inOrder, CONNECTING, mockHelper, pickerCaptor);
assertThat(pickerCaptor.getValue()).isInstanceOf(EmptyPicker.class); assertThat(pickerCaptor.getValue()).isEqualTo(EMPTY_PICKER);
deliverSubchannelState(subchannel, ConnectivityStateInfo.forNonError(IDLE)); deliverSubchannelState(subchannel, ConnectivityStateInfo.forNonError(IDLE));
inOrder.verify(mockHelper).refreshNameResolution(); inOrder.verify(mockHelper).refreshNameResolution();
@ -277,7 +280,7 @@ public class RoundRobinLoadBalancerTest {
InOrder inOrder = inOrder(mockHelper); InOrder inOrder = inOrder(mockHelper);
Status addressesAcceptanceStatus = acceptAddresses(servers, Attributes.EMPTY); Status addressesAcceptanceStatus = acceptAddresses(servers, Attributes.EMPTY);
assertThat(addressesAcceptanceStatus.isOk()).isTrue(); assertThat(addressesAcceptanceStatus.isOk()).isTrue();
inOrder.verify(mockHelper).updateBalancingState(eq(CONNECTING), isA(EmptyPicker.class)); inOrder.verify(mockHelper).updateBalancingState(eq(CONNECTING), eq(EMPTY_PICKER));
loadBalancer.shutdown(); loadBalancer.shutdown();
for (ChildLbState child : loadBalancer.getChildLbStates()) { for (ChildLbState child : loadBalancer.getChildLbStates()) {
@ -297,7 +300,7 @@ public class RoundRobinLoadBalancerTest {
Status addressesAcceptanceStatus = acceptAddresses(servers, Attributes.EMPTY); Status addressesAcceptanceStatus = acceptAddresses(servers, Attributes.EMPTY);
assertThat(addressesAcceptanceStatus.isOk()).isTrue(); assertThat(addressesAcceptanceStatus.isOk()).isTrue();
inOrder.verify(mockHelper).updateBalancingState(eq(CONNECTING), isA(EmptyPicker.class)); inOrder.verify(mockHelper).updateBalancingState(eq(CONNECTING), eq(EMPTY_PICKER));
Map<ChildLbState, Subchannel> childToSubChannelMap = new HashMap<>(); Map<ChildLbState, Subchannel> childToSubChannelMap = new HashMap<>();
// Simulate state transitions for each subchannel individually. // Simulate state transitions for each subchannel individually.
@ -336,7 +339,7 @@ public class RoundRobinLoadBalancerTest {
assertThat(addressesAcceptanceStatus.isOk()).isTrue(); assertThat(addressesAcceptanceStatus.isOk()).isTrue();
verify(mockHelper, times(3)).createSubchannel(any(CreateSubchannelArgs.class)); verify(mockHelper, times(3)).createSubchannel(any(CreateSubchannelArgs.class));
inOrder.verify(mockHelper).updateBalancingState(eq(CONNECTING), isA(EmptyPicker.class)); inOrder.verify(mockHelper).updateBalancingState(eq(CONNECTING), eq(EMPTY_PICKER));
// Simulate state transitions for each subchannel individually. // Simulate state transitions for each subchannel individually.
for (ChildLbState child : loadBalancer.getChildLbStates()) { for (ChildLbState child : loadBalancer.getChildLbStates()) {
@ -352,7 +355,7 @@ public class RoundRobinLoadBalancerTest {
deliverSubchannelState(sc, ConnectivityStateInfo.forNonError(IDLE)); deliverSubchannelState(sc, ConnectivityStateInfo.forNonError(IDLE));
inOrder.verify(mockHelper).refreshNameResolution(); inOrder.verify(mockHelper).refreshNameResolution();
verify(sc, times(2)).requestConnection(); verify(sc, times(2)).requestConnection();
inOrder.verify(mockHelper).updateBalancingState(eq(CONNECTING), isA(EmptyPicker.class)); inOrder.verify(mockHelper).updateBalancingState(eq(CONNECTING), eq(EMPTY_PICKER));
} }
AbstractTestHelper.verifyNoMoreMeaningfulInteractions(mockHelper); AbstractTestHelper.verifyNoMoreMeaningfulInteractions(mockHelper);
@ -461,7 +464,7 @@ public class RoundRobinLoadBalancerTest {
Iterator<SubchannelPicker> pickers = pickerCaptor.getAllValues().iterator(); Iterator<SubchannelPicker> pickers = pickerCaptor.getAllValues().iterator();
// The picker is incrementally updated as subchannels become READY // The picker is incrementally updated as subchannels become READY
assertEquals(CONNECTING, stateIterator.next()); assertEquals(CONNECTING, stateIterator.next());
assertThat(pickers.next()).isInstanceOf(EmptyPicker.class); assertThat(pickers.next()).isEqualTo(EMPTY_PICKER);
assertEquals(READY, stateIterator.next()); assertEquals(READY, stateIterator.next());
assertThat(getList(pickers.next())).containsExactly(sc1); assertThat(getList(pickers.next())).containsExactly(sc1);
assertEquals(READY, stateIterator.next()); assertEquals(READY, stateIterator.next());
@ -492,8 +495,8 @@ public class RoundRobinLoadBalancerTest {
@Test @Test
public void internalPickerComparisons() { public void internalPickerComparisons() {
SubchannelPicker empty1 = new EmptyPicker(); SubchannelPicker empty1 = new FixedResultPicker(PickResult.withNoResult());
SubchannelPicker empty2 = new EmptyPicker(); SubchannelPicker empty2 = new FixedResultPicker(PickResult.withNoResult());
AtomicInteger seq = new AtomicInteger(0); AtomicInteger seq = new AtomicInteger(0);
acceptAddresses(servers, Attributes.EMPTY); // create subchannels acceptAddresses(servers, Attributes.EMPTY); // create subchannels