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

xds: Update ClusterImpl test to work with PFLeafLB

This commit is contained in:
Eric Anderson 2024-09-25 09:22:07 -07:00
parent 1c069375ce
commit 9faa0f4eb0
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
xds/src/test/java/io/grpc/xds/ClusterImplLoadBalancerTest.java
View File

@ -53,6 +53,7 @@ import io.grpc.Status.Code;
import io.grpc.SynchronizationContext; import io.grpc.SynchronizationContext;
import io.grpc.internal.FakeClock; import io.grpc.internal.FakeClock;
import io.grpc.internal.ObjectPool; import io.grpc.internal.ObjectPool;
import io.grpc.internal.PickFirstLoadBalancerProvider;
import io.grpc.internal.PickSubchannelArgsImpl; import io.grpc.internal.PickSubchannelArgsImpl;
import io.grpc.protobuf.ProtoUtils; import io.grpc.protobuf.ProtoUtils;
import io.grpc.testing.TestMethodDescriptors; import io.grpc.testing.TestMethodDescriptors;
@ -384,9 +385,7 @@ public class ClusterImplLoadBalancerTest {
assertThat(clusterStats.upstreamLocalityStatsList()).isEmpty(); // no longer reported assertThat(clusterStats.upstreamLocalityStatsList()).isEmpty(); // no longer reported
} }
// TODO(dnvindhya): This test has been added as a fix to verify // Verifies https://github.com/grpc/grpc-java/issues/11434.
// https://github.com/grpc/grpc-java/issues/11434.
// Once we update PickFirstLeafLoadBalancer as default LoadBalancer, update the test.
@Test @Test
public void pickFirstLoadReport_onUpdateAddress() { public void pickFirstLoadReport_onUpdateAddress() {
Locality locality1 = Locality locality1 =
@ -435,8 +434,17 @@ public class ClusterImplLoadBalancerTest {
fakeSubchannel.updateState(ConnectivityStateInfo.forNonError(ConnectivityState.CONNECTING)); fakeSubchannel.updateState(ConnectivityStateInfo.forNonError(ConnectivityState.CONNECTING));
// Faksubchannel mimics update address and returns different locality // Faksubchannel mimics update address and returns different locality
if (PickFirstLoadBalancerProvider.isEnabledNewPickFirst()) {
fakeSubchannel.updateState(ConnectivityStateInfo.forTransientFailure(
Status.UNAVAILABLE.withDescription("Try second address instead")));
fakeSubchannel = helper.subchannels.poll();
fakeSubchannel.updateState(ConnectivityStateInfo.forNonError(ConnectivityState.CONNECTING));
fakeSubchannel.setConnectedEagIndex(0);
fakeSubchannel.updateState(ConnectivityStateInfo.forNonError(ConnectivityState.READY));
} else {
fakeSubchannel.setConnectedEagIndex(1); fakeSubchannel.setConnectedEagIndex(1);
fakeSubchannel.updateState(ConnectivityStateInfo.forNonError(ConnectivityState.READY)); fakeSubchannel.updateState(ConnectivityStateInfo.forNonError(ConnectivityState.READY));
}
result = currentPicker.pickSubchannel(pickSubchannelArgs); result = currentPicker.pickSubchannel(pickSubchannelArgs);
assertThat(result.getStatus().isOk()).isTrue(); assertThat(result.getStatus().isOk()).isTrue();
ClientStreamTracer streamTracer2 = result.getStreamTracerFactory().newClientStreamTracer( ClientStreamTracer streamTracer2 = result.getStreamTracerFactory().newClientStreamTracer(