Skip to content

Commit

Permalink
Finish test coverage for the new logic
Browse files Browse the repository at this point in the history
  • Loading branch information
@sergiitk
sergiitk committed Jul 8, 2022
1 parent 983a2dc commit 1b81cfd
Showing 1 changed file with 119 additions and 21 deletions.
140 changes: 119 additions & 21 deletions xds/src/test/java/io/grpc/xds/ClientXdsClientTestBase.java
View file
Expand Up @@ -688,7 +688,12 @@ public void ldsResponseErrorHandling_subscribedResourceInvalid() {
verifyResourceMetadataAcked(LDS, "A", resourcesV2.get("A"), VERSION_2, TIME_INCREMENT * 2);
verifyResourceMetadataNacked(LDS, "B", resourcesV1.get("B"), VERSION_1, TIME_INCREMENT,
VERSION_2, TIME_INCREMENT * 2, errorsV2);
verifyResourceMetadataDoesNotExist(LDS, "C");
if (!ignoreResourceDeletion()) {
verifyResourceMetadataDoesNotExist(LDS, "C");
} else {
// When resource deletion is disabled, {C} stays ACKed in the previous version VERSION_1.
verifyResourceMetadataAcked(LDS, "C", resourcesV1.get("C"), VERSION_1, TIME_INCREMENT);
}
call.verifyRequestNack(LDS, subscribedResourceNames, VERSION_1, "0001", NODE, errorsV2);

// LDS -> {B, C} version 3
Expand All @@ -698,15 +703,20 @@ public void ldsResponseErrorHandling_subscribedResourceInvalid() {
call.sendResponse(LDS, resourcesV3.values().asList(), VERSION_3, "0002");
// {A} -> does not exist
// {B, C} -> ACK, version 3
verifyResourceMetadataDoesNotExist(LDS, "A");
if (!ignoreResourceDeletion()) {
verifyResourceMetadataDoesNotExist(LDS, "A");
} else {
// When resource deletion is disabled, {A} stays ACKed in the previous version VERSION_2.
verifyResourceMetadataAcked(LDS, "A", resourcesV2.get("A"), VERSION_2, TIME_INCREMENT * 2);
}
verifyResourceMetadataAcked(LDS, "B", resourcesV3.get("B"), VERSION_3, TIME_INCREMENT * 3);
verifyResourceMetadataAcked(LDS, "C", resourcesV3.get("C"), VERSION_3, TIME_INCREMENT * 3);
call.verifyRequest(LDS, subscribedResourceNames, VERSION_3, "0002", NODE);
verifySubscribedResourcesMetadataSizes(3, 0, 0, 0);
}

@Test
public void ldsResponseErrorHandling_subscribedResourceInvalid_withRdsSubscriptioin() {
public void ldsResponseErrorHandling_subscribedResourceInvalid_withRdsSubscription() {
List<String> subscribedResourceNames = ImmutableList.of("A", "B", "C");
xdsClient.watchLdsResource("A", ldsResourceWatcher);
xdsClient.watchRdsResource("A.1", rdsResourceWatcher);
Expand Down Expand Up @@ -762,14 +772,26 @@ public void ldsResponseErrorHandling_subscribedResourceInvalid_withRdsSubscripti
verifyResourceMetadataNacked(
LDS, "B", resourcesV1.get("B"), VERSION_1, TIME_INCREMENT, VERSION_2, TIME_INCREMENT * 3,
errorsV2);
verifyResourceMetadataDoesNotExist(LDS, "C");
if (!ignoreResourceDeletion()) {
verifyResourceMetadataDoesNotExist(LDS, "C");
} else {
// When resource deletion is disabled, {C} stays ACKed in the previous version VERSION_1.
verifyResourceMetadataAcked(LDS, "C", resourcesV1.get("C"), VERSION_1, TIME_INCREMENT);
}
call.verifyRequestNack(LDS, subscribedResourceNames, VERSION_1, "0001", NODE, errorsV2);
// {A.1} -> does not exist
// {A.1} -> does not exist, missing from {A}
// {B.1} -> version 1
// {C.1} -> does not exist
// {C.1} -> does not exist because {C} does not exist
verifyResourceMetadataDoesNotExist(RDS, "A.1");
verifyResourceMetadataAcked(RDS, "B.1", resourcesV11.get("B.1"), VERSION_1, TIME_INCREMENT * 2);
verifyResourceMetadataDoesNotExist(RDS, "C.1");
if (!ignoreResourceDeletion()) {
verifyResourceMetadataDoesNotExist(RDS, "C.1");
} else {
// When resource deletion is disabled, {C.1} is not deleted when {C} is deleted.
// Verify {C.1} stays in the previous version VERSION_1.
verifyResourceMetadataAcked(RDS, "C.1", resourcesV11.get("C.1"), VERSION_1,
TIME_INCREMENT * 2);
}
}

@Test
Expand Down Expand Up @@ -1154,9 +1176,8 @@ public void ldsResourceDeleted() {
}

/**
* When ignore_resource_deletion server feature is on, xDS client should keep a deleted LDS.
* @see <a href="https://github.com/grpc/proposal/blob/master/A53-xds-ignore-resource-deletion.md">
* gRFC A53: Option for Ignoring xDS Resource Deletion</a>.
* When ignore_resource_deletion server feature is on, xDS client should keep the deleted listener
* on empty response, and resume the normal work when CDS contains the listener again.
* */
@Test
public void ldsResourceDeleted_ignoreResourceDeletion() {
Expand All @@ -1169,7 +1190,7 @@ public void ldsResourceDeleted_ignoreResourceDeletion() {
call.sendResponse(LDS, testListenerVhosts, VERSION_1, "0000");
call.verifyRequest(LDS, LDS_RESOURCE, VERSION_1, "0000", NODE);
verify(ldsResourceWatcher).onChanged(ldsUpdateCaptor.capture());
verifyLdsUpdateGoldenVhosts(ldsUpdateCaptor.getValue());
verifyGoldenListenerVhosts(ldsUpdateCaptor.getValue());
verifyResourceMetadataAcked(LDS, LDS_RESOURCE, testListenerVhosts, VERSION_1, TIME_INCREMENT);
verifySubscribedResourcesMetadataSizes(1, 0, 0, 0);

Expand All @@ -1182,15 +1203,16 @@ public void ldsResourceDeleted_ignoreResourceDeletion() {
// onResourceDoesNotExist not called
verify(ldsResourceWatcher, never()).onResourceDoesNotExist(LDS_RESOURCE);

// Next update is correct, and contains LDS response.
// Next update is correct, and contains the listener again.
call.sendResponse(LDS, testListenerVhosts, VERSION_3, "0003");
call.verifyRequest(LDS, LDS_RESOURCE, VERSION_3, "0003", NODE);
verify(ldsResourceWatcher).onChanged(ldsUpdateCaptor.capture());
verifyLdsUpdateGoldenVhosts(ldsUpdateCaptor.getValue());
verifyGoldenListenerVhosts(ldsUpdateCaptor.getValue());
// LDS is now ACKEd at VERSION_3.
verifyResourceMetadataAcked(LDS, LDS_RESOURCE, testListenerVhosts, VERSION_3,
TIME_INCREMENT * 3);
verifySubscribedResourcesMetadataSizes(1, 0, 0, 0);
verifyNoMoreInteractions(ldsResourceWatcher);
}

@Test
Expand Down Expand Up @@ -1451,18 +1473,23 @@ public void rdsResourceDeletedByLdsApiListener() {
DiscoveryRpcCall call = resourceDiscoveryCalls.poll();
call.sendResponse(LDS, testListenerRds, VERSION_1, "0000");
verify(ldsResourceWatcher).onChanged(ldsUpdateCaptor.capture());
verifyGoldenListenerRds(ldsUpdateCaptor.getValue());
assertThat(ldsUpdateCaptor.getValue().httpConnectionManager().rdsName())
.isEqualTo(RDS_RESOURCE);
verifyResourceMetadataAcked(LDS, LDS_RESOURCE, testListenerRds, VERSION_1, TIME_INCREMENT);
verifyResourceMetadataRequested(RDS, RDS_RESOURCE);
verifySubscribedResourcesMetadataSizes(1, 0, 1, 0);

call.sendResponse(RDS, testRouteConfig, VERSION_1, "0000");
verify(rdsResourceWatcher).onChanged(rdsUpdateCaptor.capture());
verifyGoldenRouteConfig(rdsUpdateCaptor.getValue());
assertThat(rdsUpdateCaptor.getValue().virtualHosts).hasSize(VHOST_SIZE);
verifyResourceMetadataAcked(LDS, LDS_RESOURCE, testListenerRds, VERSION_1, TIME_INCREMENT);
verifyResourceMetadataAcked(RDS, RDS_RESOURCE, testRouteConfig, VERSION_1, TIME_INCREMENT * 2);
verifySubscribedResourcesMetadataSizes(1, 0, 1, 0);

// The Listener is getting replaced configured with an RDS name, to the one configured with
// vhosts. Expect the RDS resources to be discarded.
// Note that this must work the same despite the ignore_resource_deletion feature is on.
// This happens because the Listener is getting replaced, and not deleted.
call.sendResponse(LDS, testListenerVhosts, VERSION_2, "0001");
verify(ldsResourceWatcher, times(2)).onChanged(ldsUpdateCaptor.capture());
verifyGoldenListenerVhosts(ldsUpdateCaptor.getValue());
Expand Down Expand Up @@ -1514,6 +1541,8 @@ public void rdsResourcesDeletedByLdsTcpListener() {

// Simulates receiving an updated version of the requested LDS resource as a TCP listener
// with a filter chain containing inlined RouteConfiguration.
// Note that this must work the same despite the ignore_resource_deletion feature is on.
// This happens because the Listener is getting replaced, and not deleted.
hcmFilter = mf.buildHttpConnectionManagerFilter(
null,
mf.buildRouteConfiguration(
Expand Down Expand Up @@ -1694,7 +1723,12 @@ public void cdsResponseErrorHandling_subscribedResourceInvalid() {
verifyResourceMetadataAcked(CDS, "A", resourcesV2.get("A"), VERSION_2, TIME_INCREMENT * 2);
verifyResourceMetadataNacked(CDS, "B", resourcesV1.get("B"), VERSION_1, TIME_INCREMENT,
VERSION_2, TIME_INCREMENT * 2, errorsV2);
verifyResourceMetadataDoesNotExist(CDS, "C");
if (!ignoreResourceDeletion()) {
verifyResourceMetadataDoesNotExist(CDS, "C");
} else {
// When resource deletion is disabled, {C} stays ACKed in the previous version VERSION_1.
verifyResourceMetadataAcked(CDS, "C", resourcesV1.get("C"), VERSION_1, TIME_INCREMENT);
}
call.verifyRequestNack(CDS, subscribedResourceNames, VERSION_1, "0001", NODE, errorsV2);

// CDS -> {B, C} version 3
Expand All @@ -1708,7 +1742,12 @@ public void cdsResponseErrorHandling_subscribedResourceInvalid() {
call.sendResponse(CDS, resourcesV3.values().asList(), VERSION_3, "0002");
// {A} -> does not exit
// {B, C} -> ACK, version 3
verifyResourceMetadataDoesNotExist(CDS, "A");
if (!ignoreResourceDeletion()) {
verifyResourceMetadataDoesNotExist(CDS, "A");
} else {
// When resource deletion is disabled, {A} stays ACKed in the previous version VERSION_2.
verifyResourceMetadataAcked(CDS, "A", resourcesV2.get("A"), VERSION_2, TIME_INCREMENT * 2);
}
verifyResourceMetadataAcked(CDS, "B", resourcesV3.get("B"), VERSION_3, TIME_INCREMENT * 3);
verifyResourceMetadataAcked(CDS, "C", resourcesV3.get("C"), VERSION_3, TIME_INCREMENT * 3);
call.verifyRequest(CDS, subscribedResourceNames, VERSION_3, "0002", NODE);
Expand Down Expand Up @@ -1780,14 +1819,26 @@ public void cdsResponseErrorHandling_subscribedResourceInvalid_withEdsSubscripti
verifyResourceMetadataNacked(
CDS, "B", resourcesV1.get("B"), VERSION_1, TIME_INCREMENT, VERSION_2, TIME_INCREMENT * 3,
errorsV2);
verifyResourceMetadataDoesNotExist(CDS, "C");
if (!ignoreResourceDeletion()) {
verifyResourceMetadataDoesNotExist(CDS, "C");
} else {
// When resource deletion is disabled, {C} stays ACKed in the previous version VERSION_1.
verifyResourceMetadataAcked(CDS, "C", resourcesV1.get("C"), VERSION_1, TIME_INCREMENT);
}
call.verifyRequestNack(CDS, subscribedResourceNames, VERSION_1, "0001", NODE, errorsV2);
// {A.1} -> does not exist
// {A.1} -> does not exist, missing from {A}
// {B.1} -> version 1
// {C.1} -> does not exist
// {C.1} -> does not exist because {C} does not exist
verifyResourceMetadataDoesNotExist(EDS, "A.1");
verifyResourceMetadataAcked(EDS, "B.1", resourcesV11.get("B.1"), VERSION_1, TIME_INCREMENT * 2);
verifyResourceMetadataDoesNotExist(EDS, "C.1");
if (!ignoreResourceDeletion()) {
verifyResourceMetadataDoesNotExist(EDS, "C.1");
} else {
// When resource deletion is disabled, {C.1} is not deleted when {C} is deleted.
// Verify {C.1} stays in the previous version VERSION_1.
verifyResourceMetadataAcked(EDS, "C.1", resourcesV11.get("C.1"), VERSION_1,
TIME_INCREMENT * 2);
}
}

@Test
Expand Down Expand Up @@ -2189,6 +2240,8 @@ public void cdsResourceUpdatedWithDuplicate() {

@Test
public void cdsResourceDeleted() {
Assume.assumeFalse(ignoreResourceDeletion());

DiscoveryRpcCall call = startResourceWatcher(CDS, CDS_RESOURCE, cdsResourceWatcher);
verifyResourceMetadataRequested(CDS, CDS_RESOURCE);

Expand All @@ -2209,6 +2262,48 @@ public void cdsResourceDeleted() {
verifySubscribedResourcesMetadataSizes(0, 1, 0, 0);
}

/**
* When ignore_resource_deletion server feature is on, xDS client should keep the deleted cluster
* on empty response, and resume the normal work when CDS contains the cluster again.
* */
@Test
public void cdsResourceDeleted_ignoreResourceDeletion() {
Assume.assumeTrue(ignoreResourceDeletion());

DiscoveryRpcCall call = startResourceWatcher(CDS, CDS_RESOURCE, cdsResourceWatcher);
verifyResourceMetadataRequested(CDS, CDS_RESOURCE);

// Initial CDS response.
call.sendResponse(CDS, testClusterRoundRobin, VERSION_1, "0000");
call.verifyRequest(CDS, CDS_RESOURCE, VERSION_1, "0000", NODE);
verify(cdsResourceWatcher).onChanged(cdsUpdateCaptor.capture());
verifyGoldenClusterRoundRobin(cdsUpdateCaptor.getValue());
verifyResourceMetadataAcked(CDS, CDS_RESOURCE, testClusterRoundRobin, VERSION_1,
TIME_INCREMENT);
verifySubscribedResourcesMetadataSizes(0, 1, 0, 0);

// Empty LDS response does not delete the cluster.
call.sendResponse(CDS, Collections.emptyList(), VERSION_2, "0001");
call.verifyRequest(CDS, CDS_RESOURCE, VERSION_2, "0001", NODE);

// The resource is still ACKED at VERSION_1 (no changes).
verifyResourceMetadataAcked(CDS, CDS_RESOURCE, testClusterRoundRobin, VERSION_1,
TIME_INCREMENT);
verifySubscribedResourcesMetadataSizes(0, 1, 0, 0);
// onResourceDoesNotExist must not be called.
verify(cdsResourceWatcher, never()).onResourceDoesNotExist(CDS_RESOURCE);

// Next update is correct, and contains the cluster again.
call.sendResponse(CDS, testClusterRoundRobin, VERSION_3, "0003");
call.verifyRequest(CDS, CDS_RESOURCE, VERSION_3, "0003", NODE);
verify(cdsResourceWatcher).onChanged(cdsUpdateCaptor.capture());
verifyGoldenClusterRoundRobin(cdsUpdateCaptor.getValue());
verifyResourceMetadataAcked(CDS, CDS_RESOURCE, testClusterRoundRobin, VERSION_3,
TIME_INCREMENT * 3);
verifySubscribedResourcesMetadataSizes(0, 1, 0, 0);
verifyNoMoreInteractions(cdsResourceWatcher);
}

@Test
public void multipleCdsWatchers() {
String cdsResourceTwo = "cluster-bar.googleapis.com";
Expand Down Expand Up @@ -2605,7 +2700,10 @@ public void edsResourceDeletedByCds() {
call.sendResponse(CDS, clusters, VERSION_2, "0001");
verify(cdsResourceWatcher, times(2)).onChanged(cdsUpdateCaptor.capture());
assertThat(cdsUpdateCaptor.getValue().edsServiceName()).isNull();
// Note that the endpoint must be deleted even if the ignore_resource_deletion feature.
// This happens because the cluster CDS_RESOURCE is getting replaced, and not deleted.
verify(edsResourceWatcher).onResourceDoesNotExist(EDS_RESOURCE);
verify(edsResourceWatcher, never()).onResourceDoesNotExist(resource);
verifyNoMoreInteractions(cdsWatcher, edsWatcher);
verifyResourceMetadataDoesNotExist(EDS, EDS_RESOURCE);
verifyResourceMetadataAcked(
Expand Down

0 comments on commit 1b81cfd

Please sign in to comment.