Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

xds: only reschedule timer for unresolved resources upon ADS stream restarts #7582

Merged
merged 1 commit into from Nov 2, 2020
Merged

xds: only reschedule timer for unresolved resources upon ADS stream restarts #7582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion xds/src/main/java/io/grpc/xds/ClientXdsClient.java
View file
Open in desktop
Expand Up @@ -754,8 +754,10 @@ void removeWatcher(ResourceWatcher watcher) {
watchers.remove(watcher);
}

// FIXME(chengyuanzhang): should only restart timer if the resource is still unresolved.
void restartTimer() {
if (data != null || absent) { // resource already resolved
return;
}
class ResourceNotFound implements Runnable {
@Override
public void run() {
Expand Down
25 changes: 21 additions & 4 deletions xds/src/test/java/io/grpc/xds/ClientXdsClientTest.java
View file
Open in desktop
Expand Up @@ -1463,7 +1463,7 @@ public void streamClosedAndRetryRaceWithAddRemoveWatchers() {
}

@Test
public void streamClosedAndRetryRestartResourceInitialFetchTimers() {
public void streamClosedAndRetryRestartsResourceInitialFetchTimerForUnresolvedResources() {
xdsClient.watchLdsResource(LDS_RESOURCE, ldsResourceWatcher);
xdsClient.watchRdsResource(RDS_RESOURCE, rdsResourceWatcher);
xdsClient.watchCdsResource(CDS_RESOURCE, cdsResourceWatcher);
Expand All @@ -1477,15 +1477,32 @@ public void streamClosedAndRetryRestartResourceInitialFetchTimers() {
Iterables.getOnlyElement(fakeClock.getPendingTasks(CDS_RESOURCE_FETCH_TIMEOUT_TASK_FILTER));
ScheduledTask edsResourceTimeout =
Iterables.getOnlyElement(fakeClock.getPendingTasks(EDS_RESOURCE_FETCH_TIMEOUT_TASK_FILTER));
call.responseObserver.onError(Status.UNAVAILABLE.asException());

List<Any> listeners = ImmutableList.of(
Any.pack(buildListener(LDS_RESOURCE,
Any.pack(
HttpConnectionManager.newBuilder()
.setRouteConfig(buildRouteConfiguration("do not care", buildVirtualHosts(2)))
.build()))));
DiscoveryResponse response =
buildDiscoveryResponse("0", listeners, ResourceType.LDS.typeUrl(), "0000");
call.responseObserver.onNext(response);
assertThat(ldsResourceTimeout.isCancelled()).isTrue();

List<Any> routeConfigs =
ImmutableList.of(Any.pack(buildRouteConfiguration(RDS_RESOURCE, buildVirtualHosts(2))));
response =
buildDiscoveryResponse("0", routeConfigs, ResourceType.RDS.typeUrl(), "0000");
call.responseObserver.onNext(response);
assertThat(rdsResourceTimeout.isCancelled()).isTrue();

call.responseObserver.onError(Status.UNAVAILABLE.asException());
assertThat(cdsResourceTimeout.isCancelled()).isTrue();
assertThat(edsResourceTimeout.isCancelled()).isTrue();

fakeClock.forwardNanos(10L);
assertThat(fakeClock.getPendingTasks(LDS_RESOURCE_FETCH_TIMEOUT_TASK_FILTER)).hasSize(1);
assertThat(fakeClock.getPendingTasks(RDS_RESOURCE_FETCH_TIMEOUT_TASK_FILTER)).hasSize(1);
assertThat(fakeClock.getPendingTasks(LDS_RESOURCE_FETCH_TIMEOUT_TASK_FILTER)).hasSize(0);
assertThat(fakeClock.getPendingTasks(RDS_RESOURCE_FETCH_TIMEOUT_TASK_FILTER)).hasSize(0);
assertThat(fakeClock.getPendingTasks(CDS_RESOURCE_FETCH_TIMEOUT_TASK_FILTER)).hasSize(1);
assertThat(fakeClock.getPendingTasks(EDS_RESOURCE_FETCH_TIMEOUT_TASK_FILTER)).hasSize(1);
}
Expand Down