Skip to content

xds: Squelch ADS reconnection error logs (1.45.x backport) #8942

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

Merged
ejona86 merged 1 commit into from
Feb 24, 2022
Merged

xds: Squelch ADS reconnection error logs (1.45.x backport) #8942

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions xds/src/main/java/io/grpc/xds/XdsNameResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,9 @@ final class XdsNameResolver extends NameResolver {
private XdsClient xdsClient;
private CallCounterProvider callCounterProvider;
private ResolveState resolveState;
// Workaround for https://github.com/grpc/grpc-java/issues/8886 . This should be handled in
// XdsClient instead of here.
private boolean receivedConfig;

XdsNameResolver(
@Nullable String targetAuthority, String name, ServiceConfigParser serviceConfigParser,
Expand Down Expand Up @@ -293,6 +296,7 @@ private void updateResolutionResult() {
.setServiceConfig(parsedServiceConfig)
.build();
listener.onResult(result);
receivedConfig = true;
}

@VisibleForTesting
Expand Down Expand Up @@ -715,7 +719,7 @@ public void onError(final Status error) {
syncContext.execute(new Runnable() {
@Override
public void run() {
if (stopped) {
if (stopped || receivedConfig) {
return;
}
listener.onError(error);
Expand Down Expand Up @@ -865,6 +869,7 @@ private void cleanUpRoutes() {
}
routingConfig = RoutingConfig.empty;
listener.onResult(emptyResult);
receivedConfig = true;
}

private void cleanUpRouteDiscoveryState() {
Expand Down Expand Up @@ -912,7 +917,7 @@ public void onError(final Status error) {
syncContext.execute(new Runnable() {
@Override
public void run() {
if (RouteDiscoveryState.this != routeDiscoveryState) {
if (RouteDiscoveryState.this != routeDiscoveryState || receivedConfig) {
return;
}
listener.onError(error);
Expand Down