Skip to content

xds: not to log warning when xds stream onCompleted() #8773

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

Closed
wants to merge 1 commit into from
Closed

xds: not to log warning when xds stream onCompleted() #8773

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion xds/src/main/java/io/grpc/xds/AbstractXdsClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@
*/
final class AbstractXdsClient {

static final Status COMPLETED_BY_SERVER =
Status.UNAVAILABLE.withDescription("Closed by server");
private static final String ADS_TYPE_URL_LDS_V2 = "type.googleapis.com/envoy.api.v2.Listener";
private static final String ADS_TYPE_URL_LDS =
"type.googleapis.com/envoy.config.listener.v3.Listener";
Expand Down Expand Up @@ -450,7 +452,7 @@ final void handleRpcError(Throwable t) {
}

final void handleRpcCompleted() {
handleRpcStreamClosed(Status.UNAVAILABLE.withDescription("Closed by server"));
handleRpcStreamClosed(COMPLETED_BY_SERVER);
}

private void handleRpcStreamClosed(Status error) {
Expand Down
3 changes: 3 additions & 0 deletions xds/src/main/java/io/grpc/xds/ClientXdsClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1860,6 +1860,9 @@ private static int getRatePerMillion(FractionalPercent percent) {
public void handleStreamClosed(Status error) {
syncContext.throwIfNotInThisSynchronizationContext();
cleanUpResourceTimers();
if (error.equals(AbstractXdsClient.COMPLETED_BY_SERVER)) {
return;
}
for (ResourceSubscriber subscriber : ldsResourceSubscribers.values()) {
subscriber.onError(error);
}
Expand Down