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

core: [outlier detection] eject/uneject states to delegate listener. (#9469)

This commit is contained in:
Terry Wilson 2022-08-22 11:34:50 -07:00 committed by GitHub
parent fbefdf5ea7
commit b16e0e34a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/io/grpc/util/OutlierDetectionLoadBalancer.java
View File

@ -233,7 +233,7 @@ public final class OutlierDetectionLoadBalancer extends LoadBalancer {
private AddressTracker addressTracker; private AddressTracker addressTracker;
private boolean ejected; private boolean ejected;
private ConnectivityStateInfo lastSubchannelState; private ConnectivityStateInfo lastSubchannelState;
private OutlierDetectionSubchannelStateListener subchannelStateListener; private SubchannelStateListener subchannelStateListener;
OutlierDetectionSubchannel(Subchannel delegate) { OutlierDetectionSubchannel(Subchannel delegate) {
this.delegate = delegate; this.delegate = delegate;
@ -241,8 +241,8 @@ public final class OutlierDetectionLoadBalancer extends LoadBalancer {
@Override @Override
public void start(SubchannelStateListener listener) { public void start(SubchannelStateListener listener) {
subchannelStateListener = new OutlierDetectionSubchannelStateListener(listener); subchannelStateListener = listener;
super.start(subchannelStateListener); super.start(new OutlierDetectionSubchannelStateListener(listener));
} }
@Override @Override

55
core/src/test/java/io/grpc/util/OutlierDetectionLoadBalancerTest.java
View File

@ -356,7 +356,7 @@ public class OutlierDetectionLoadBalancerTest {
loadBalancer.handleResolvedAddresses(buildResolvedAddress(config, servers)); loadBalancer.handleResolvedAddresses(buildResolvedAddress(config, servers));
generateLoad(ImmutableMap.of()); generateLoad(ImmutableMap.of(), 7);
// Move forward in time to a point where the detection timer has fired. // Move forward in time to a point where the detection timer has fired.
forwardTime(config); forwardTime(config);
@ -380,7 +380,7 @@ public class OutlierDetectionLoadBalancerTest {
loadBalancer.handleResolvedAddresses(buildResolvedAddress(config, servers)); loadBalancer.handleResolvedAddresses(buildResolvedAddress(config, servers));
generateLoad(ImmutableMap.of(subchannel1, Status.DEADLINE_EXCEEDED)); generateLoad(ImmutableMap.of(subchannel1, Status.DEADLINE_EXCEEDED), 7);
// Move forward in time to a point where the detection timer has fired. // Move forward in time to a point where the detection timer has fired.
forwardTime(config); forwardTime(config);
@ -405,7 +405,7 @@ public class OutlierDetectionLoadBalancerTest {
loadBalancer.handleResolvedAddresses(buildResolvedAddress(config, servers)); loadBalancer.handleResolvedAddresses(buildResolvedAddress(config, servers));
generateLoad(ImmutableMap.of(subchannel1, Status.DEADLINE_EXCEEDED)); generateLoad(ImmutableMap.of(subchannel1, Status.DEADLINE_EXCEEDED), 7);
// Move forward in time to a point where the detection timer has fired. // Move forward in time to a point where the detection timer has fired.
forwardTime(config); forwardTime(config);
@ -425,7 +425,7 @@ public class OutlierDetectionLoadBalancerTest {
loadBalancer.handleResolvedAddresses(buildResolvedAddress(config, servers)); loadBalancer.handleResolvedAddresses(buildResolvedAddress(config, servers));
generateLoad(ImmutableMap.of(subchannel2, Status.DEADLINE_EXCEEDED)); generateLoad(ImmutableMap.of(subchannel2, Status.DEADLINE_EXCEEDED), 8);
// Move forward in time to a point where the detection timer has fired. // Move forward in time to a point where the detection timer has fired.
forwardTime(config); forwardTime(config);
@ -450,7 +450,7 @@ public class OutlierDetectionLoadBalancerTest {
loadBalancer.handleResolvedAddresses(buildResolvedAddress(config, servers)); loadBalancer.handleResolvedAddresses(buildResolvedAddress(config, servers));
generateLoad(ImmutableMap.of(subchannel1, Status.DEADLINE_EXCEEDED)); generateLoad(ImmutableMap.of(subchannel1, Status.DEADLINE_EXCEEDED), 7);
// Move forward in time to a point where the detection timer has fired. // Move forward in time to a point where the detection timer has fired.
fakeClock.forwardTime(config.intervalNanos + 1, TimeUnit.NANOSECONDS); fakeClock.forwardTime(config.intervalNanos + 1, TimeUnit.NANOSECONDS);
@ -459,7 +459,7 @@ public class OutlierDetectionLoadBalancerTest {
assertEjectedSubchannels(ImmutableSet.of(servers.get(0).getAddresses().get(0))); assertEjectedSubchannels(ImmutableSet.of(servers.get(0).getAddresses().get(0)));
// Now we produce more load, but the subchannel start working and is no longer an outlier. // Now we produce more load, but the subchannel start working and is no longer an outlier.
generateLoad(ImmutableMap.of()); generateLoad(ImmutableMap.of(), 8);
// Move forward in time to a point where the detection timer has fired. // Move forward in time to a point where the detection timer has fired.
fakeClock.forwardTime(config.maxEjectionTimeNanos + 1, TimeUnit.NANOSECONDS); fakeClock.forwardTime(config.maxEjectionTimeNanos + 1, TimeUnit.NANOSECONDS);
@ -486,7 +486,7 @@ public class OutlierDetectionLoadBalancerTest {
// We produce an outlier, but don't give it enough calls to reach the minimum volume. // We produce an outlier, but don't give it enough calls to reach the minimum volume.
generateLoad( generateLoad(
ImmutableMap.of(subchannel1, Status.DEADLINE_EXCEEDED), ImmutableMap.of(subchannel1, Status.DEADLINE_EXCEEDED),
ImmutableMap.of(subchannel1, 19)); ImmutableMap.of(subchannel1, 19), 7);
// Move forward in time to a point where the detection timer has fired. // Move forward in time to a point where the detection timer has fired.
forwardTime(config); forwardTime(config);
@ -510,7 +510,7 @@ public class OutlierDetectionLoadBalancerTest {
loadBalancer.handleResolvedAddresses(buildResolvedAddress(config, servers)); loadBalancer.handleResolvedAddresses(buildResolvedAddress(config, servers));
generateLoad(ImmutableMap.of(subchannel1, Status.DEADLINE_EXCEEDED)); generateLoad(ImmutableMap.of(subchannel1, Status.DEADLINE_EXCEEDED), 7);
// Move forward in time to a point where the detection timer has fired. // Move forward in time to a point where the detection timer has fired.
forwardTime(config); forwardTime(config);
@ -536,7 +536,7 @@ public class OutlierDetectionLoadBalancerTest {
loadBalancer.handleResolvedAddresses(buildResolvedAddress(config, servers)); loadBalancer.handleResolvedAddresses(buildResolvedAddress(config, servers));
generateLoad(ImmutableMap.of(subchannel1, Status.DEADLINE_EXCEEDED)); generateLoad(ImmutableMap.of(subchannel1, Status.DEADLINE_EXCEEDED), 7);
// Move forward in time to a point where the detection timer has fired. // Move forward in time to a point where the detection timer has fired.
forwardTime(config); forwardTime(config);
@ -563,7 +563,7 @@ public class OutlierDetectionLoadBalancerTest {
generateLoad(ImmutableMap.of( generateLoad(ImmutableMap.of(
subchannel1, Status.DEADLINE_EXCEEDED, subchannel1, Status.DEADLINE_EXCEEDED,
subchannel2, Status.DEADLINE_EXCEEDED)); subchannel2, Status.DEADLINE_EXCEEDED), 7);
// Move forward in time to a point where the detection timer has fired. // Move forward in time to a point where the detection timer has fired.
forwardTime(config); forwardTime(config);
@ -591,7 +591,7 @@ public class OutlierDetectionLoadBalancerTest {
generateLoad(ImmutableMap.of( generateLoad(ImmutableMap.of(
subchannel1, Status.DEADLINE_EXCEEDED, subchannel1, Status.DEADLINE_EXCEEDED,
subchannel2, Status.DEADLINE_EXCEEDED)); subchannel2, Status.DEADLINE_EXCEEDED), 7);
// Move forward in time to a point where the detection timer has fired. // Move forward in time to a point where the detection timer has fired.
forwardTime(config); forwardTime(config);
@ -626,7 +626,7 @@ public class OutlierDetectionLoadBalancerTest {
loadBalancer.handleResolvedAddresses(buildResolvedAddress(config, servers)); loadBalancer.handleResolvedAddresses(buildResolvedAddress(config, servers));
// By default all calls will return OK. // By default all calls will return OK.
generateLoad(ImmutableMap.of()); generateLoad(ImmutableMap.of(), 7);
// Move forward in time to a point where the detection timer has fired. // Move forward in time to a point where the detection timer has fired.
forwardTime(config); forwardTime(config);
@ -650,7 +650,7 @@ public class OutlierDetectionLoadBalancerTest {
loadBalancer.handleResolvedAddresses(buildResolvedAddress(config, servers)); loadBalancer.handleResolvedAddresses(buildResolvedAddress(config, servers));
generateLoad(ImmutableMap.of(subchannel1, Status.DEADLINE_EXCEEDED)); generateLoad(ImmutableMap.of(subchannel1, Status.DEADLINE_EXCEEDED), 7);
// Move forward in time to a point where the detection timer has fired. // Move forward in time to a point where the detection timer has fired.
forwardTime(config); forwardTime(config);
@ -674,7 +674,7 @@ public class OutlierDetectionLoadBalancerTest {
loadBalancer.handleResolvedAddresses(buildResolvedAddress(config, servers)); loadBalancer.handleResolvedAddresses(buildResolvedAddress(config, servers));
generateLoad(ImmutableMap.of(subchannel1, Status.DEADLINE_EXCEEDED)); generateLoad(ImmutableMap.of(subchannel1, Status.DEADLINE_EXCEEDED), 7);
// Move forward in time to a point where the detection timer has fired. // Move forward in time to a point where the detection timer has fired.
forwardTime(config); forwardTime(config);
@ -700,7 +700,7 @@ public class OutlierDetectionLoadBalancerTest {
loadBalancer.handleResolvedAddresses(buildResolvedAddress(config, servers)); loadBalancer.handleResolvedAddresses(buildResolvedAddress(config, servers));
generateLoad(ImmutableMap.of(subchannel1, Status.DEADLINE_EXCEEDED)); generateLoad(ImmutableMap.of(subchannel1, Status.DEADLINE_EXCEEDED), 7);
// Move forward in time to a point where the detection timer has fired. // Move forward in time to a point where the detection timer has fired.
forwardTime(config); forwardTime(config);
@ -737,7 +737,7 @@ public class OutlierDetectionLoadBalancerTest {
subchannel1, Status.DEADLINE_EXCEEDED, subchannel1, Status.DEADLINE_EXCEEDED,
subchannel2, Status.DEADLINE_EXCEEDED, subchannel2, Status.DEADLINE_EXCEEDED,
subchannel3, Status.DEADLINE_EXCEEDED), subchannel3, Status.DEADLINE_EXCEEDED),
ImmutableMap.of(subchannel3, 1)); ImmutableMap.of(subchannel3, 1), 7);
// Move forward in time to a point where the detection timer has fired. // Move forward in time to a point where the detection timer has fired.
forwardTime(config); forwardTime(config);
@ -766,7 +766,7 @@ public class OutlierDetectionLoadBalancerTest {
loadBalancer.handleResolvedAddresses(buildResolvedAddress(config, servers)); loadBalancer.handleResolvedAddresses(buildResolvedAddress(config, servers));
generateLoad(ImmutableMap.of(subchannel1, Status.DEADLINE_EXCEEDED)); generateLoad(ImmutableMap.of(subchannel1, Status.DEADLINE_EXCEEDED), 7);
// Move forward in time to a point where the detection timer has fired. // Move forward in time to a point where the detection timer has fired.
forwardTime(config); forwardTime(config);
@ -813,7 +813,7 @@ public class OutlierDetectionLoadBalancerTest {
loadBalancer.handleResolvedAddresses(buildResolvedAddress(config, servers)); loadBalancer.handleResolvedAddresses(buildResolvedAddress(config, servers));
generateLoad(ImmutableMap.of()); generateLoad(ImmutableMap.of(), 7);
// Move forward in time to a point where the detection timer has fired. // Move forward in time to a point where the detection timer has fired.
forwardTime(config); forwardTime(config);
@ -860,7 +860,7 @@ public class OutlierDetectionLoadBalancerTest {
loadBalancer.handleResolvedAddresses(buildResolvedAddress(config, servers)); loadBalancer.handleResolvedAddresses(buildResolvedAddress(config, servers));
generateLoad(ImmutableMap.of(subchannel1, Status.DEADLINE_EXCEEDED)); generateLoad(ImmutableMap.of(subchannel1, Status.DEADLINE_EXCEEDED), 7);
// Move forward in time to a point where the detection timer has fired. // Move forward in time to a point where the detection timer has fired.
forwardTime(config); forwardTime(config);
@ -922,7 +922,7 @@ public class OutlierDetectionLoadBalancerTest {
loadBalancer.handleResolvedAddresses(buildResolvedAddress(config, servers)); loadBalancer.handleResolvedAddresses(buildResolvedAddress(config, servers));
generateLoad(ImmutableMap.of()); generateLoad(ImmutableMap.of(), 7);
// Move forward in time to a point where the detection timer has fired. // Move forward in time to a point where the detection timer has fired.
forwardTime(config); forwardTime(config);
@ -949,7 +949,7 @@ public class OutlierDetectionLoadBalancerTest {
loadBalancer.handleResolvedAddresses(buildResolvedAddress(config, servers)); loadBalancer.handleResolvedAddresses(buildResolvedAddress(config, servers));
generateLoad(ImmutableMap.of(subchannel1, Status.DEADLINE_EXCEEDED)); generateLoad(ImmutableMap.of(subchannel1, Status.DEADLINE_EXCEEDED), 7);
// Move forward in time to a point where the detection timer has fired. // Move forward in time to a point where the detection timer has fired.
forwardTime(config); forwardTime(config);
@ -976,7 +976,7 @@ public class OutlierDetectionLoadBalancerTest {
loadBalancer.handleResolvedAddresses(buildResolvedAddress(config, servers)); loadBalancer.handleResolvedAddresses(buildResolvedAddress(config, servers));
generateLoad(ImmutableMap.of(subchannel1, Status.DEADLINE_EXCEEDED)); generateLoad(ImmutableMap.of(subchannel1, Status.DEADLINE_EXCEEDED), 7);
// Move forward in time to a point where the detection timer has fired. // Move forward in time to a point where the detection timer has fired.
forwardTime(config); forwardTime(config);
@ -1025,22 +1025,23 @@ public class OutlierDetectionLoadBalancerTest {
subchannelStateListeners.get(subchannel).onSubchannelState(newState); subchannelStateListeners.get(subchannel).onSubchannelState(newState);
} }
private void generateLoad(Map<Subchannel, Status> statusMap) { private void generateLoad(Map<Subchannel, Status> statusMap, int expectedStateChanges) {
generateLoad(statusMap, null); generateLoad(statusMap, null, expectedStateChanges);
} }
// Generates 100 calls, 20 each across the subchannels. Default status is OK. // Generates 100 calls, 20 each across the subchannels. Default status is OK.
private void generateLoad(Map<Subchannel, Status> statusMap, private void generateLoad(Map<Subchannel, Status> statusMap,
Map<Subchannel, Integer> maxCallsMap) { Map<Subchannel, Integer> maxCallsMap, int expectedStateChanges) {
deliverSubchannelState(subchannel1, ConnectivityStateInfo.forNonError(READY)); deliverSubchannelState(subchannel1, ConnectivityStateInfo.forNonError(READY));
deliverSubchannelState(subchannel2, ConnectivityStateInfo.forNonError(READY)); deliverSubchannelState(subchannel2, ConnectivityStateInfo.forNonError(READY));
deliverSubchannelState(subchannel3, ConnectivityStateInfo.forNonError(READY)); deliverSubchannelState(subchannel3, ConnectivityStateInfo.forNonError(READY));
deliverSubchannelState(subchannel4, ConnectivityStateInfo.forNonError(READY)); deliverSubchannelState(subchannel4, ConnectivityStateInfo.forNonError(READY));
deliverSubchannelState(subchannel5, ConnectivityStateInfo.forNonError(READY)); deliverSubchannelState(subchannel5, ConnectivityStateInfo.forNonError(READY));
verify(mockHelper, times(7)).updateBalancingState(stateCaptor.capture(), verify(mockHelper, times(expectedStateChanges)).updateBalancingState(stateCaptor.capture(),
pickerCaptor.capture()); pickerCaptor.capture());
SubchannelPicker picker = pickerCaptor.getAllValues().get(6); SubchannelPicker picker = pickerCaptor.getAllValues()
.get(pickerCaptor.getAllValues().size() - 1);
HashMap<Subchannel, Integer> callCountMap = new HashMap<>(); HashMap<Subchannel, Integer> callCountMap = new HashMap<>();
for (int i = 0; i < 100; i++) { for (int i = 0; i < 100; i++) {