Skip to content

xds: parse HttpFault filter from LDS/RDS response #7841

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
dapengzhang0 merged 7 commits into from
Jan 28, 2021
Merged

xds: parse HttpFault filter from LDS/RDS response #7841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a192aa4
xds: parse HttpFault filter from LDS/RDS response
dapengzhang0 Jan 25, 2021
5e8c3e1
add tests
dapengzhang0 Jan 25, 2021
502e0a3
add missing fields maxActiveFaults etc
dapengzhang0 Jan 27, 2021
d91cb37
use Status.fromCodeValue
dapengzhang0 Jan 27, 2021
35121ca
refactor decodeFaultFilterConfig
dapengzhang0 Jan 27, 2021
f8a26e9
use explicit boolean for headerDelay and headerAbort
dapengzhang0 Jan 27, 2021
537477d
parse regardless of feature flag
dapengzhang0 Jan 27, 2021
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
28 changes: 26 additions & 2 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 @@ -17,6 +17,7 @@
package io.grpc.xds;

import static com.google.common.base.Preconditions.checkArgument;
import static io.grpc.xds.EnvoyProtoData.HTTP_FAULT_FILTER_NAME;
import static io.grpc.xds.EnvoyProtoData.TRANSPORT_SOCKET_NAME_TLS;

import com.google.common.annotations.VisibleForTesting;
Expand All @@ -38,12 +39,14 @@
import io.envoyproxy.envoy.config.route.v3.RouteConfiguration;
import io.envoyproxy.envoy.config.route.v3.VirtualHost;
import io.envoyproxy.envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager;
import io.envoyproxy.envoy.extensions.filters.network.http_connection_manager.v3.HttpFilter;
import io.envoyproxy.envoy.extensions.filters.network.http_connection_manager.v3.Rds;
import io.grpc.ManagedChannel;
import io.grpc.Status;
import io.grpc.SynchronizationContext.ScheduledHandle;
import io.grpc.internal.BackoffPolicy;
import io.grpc.xds.EnvoyProtoData.DropOverload;
import io.grpc.xds.EnvoyProtoData.HttpFault;
import io.grpc.xds.EnvoyProtoData.Locality;
import io.grpc.xds.EnvoyProtoData.LocalityLbEndpoints;
import io.grpc.xds.EnvoyProtoData.Node;
Expand Down Expand Up @@ -163,6 +166,26 @@ protected void handleLdsResponse(String versionInfo, List<Any> resources, String
maxStreamDuration = Durations.toNanos(options.getMaxStreamDuration());
}
}
boolean hasFaultInjection = false;
HttpFault httpFault = null;
List<HttpFilter> httpFilters = hcm.getHttpFiltersList();
for (HttpFilter httpFilter : httpFilters) {
if (HTTP_FAULT_FILTER_NAME.equals(httpFilter.getName())) {
hasFaultInjection = true;
if (httpFilter.hasTypedConfig()) {
StructOrError<HttpFault> httpFaultOrError =
HttpFault.decodeFaultFilterConfig(httpFilter.getTypedConfig());
if (httpFaultOrError.getErrorDetail() != null) {
nackResponse(ResourceType.LDS, nonce,
"Listener " + listenerName + " contains invalid HttpFault filter: "
+ httpFaultOrError.getErrorDetail());
return;
}
httpFault = httpFaultOrError.getStruct();
}
break;
}
}
if (hcm.hasRouteConfig()) {
List<EnvoyProtoData.VirtualHost> virtualHosts = new ArrayList<>();
for (VirtualHost virtualHostProto : hcm.getRouteConfig().getVirtualHostsList()) {
Expand All @@ -176,15 +199,16 @@ protected void handleLdsResponse(String versionInfo, List<Any> resources, String
}
virtualHosts.add(virtualHost.getStruct());
}
update = new LdsUpdate(maxStreamDuration, virtualHosts);
update = new LdsUpdate(maxStreamDuration, virtualHosts, hasFaultInjection, httpFault);
} else if (hcm.hasRds()) {
Rds rds = hcm.getRds();
if (!rds.getConfigSource().hasAds()) {
nackResponse(ResourceType.LDS, nonce,
"Listener " + listenerName + " with RDS config_source not set to ADS");
return;
}
update = new LdsUpdate(maxStreamDuration, rds.getRouteConfigName());
update = new LdsUpdate(
maxStreamDuration, rds.getRouteConfigName(), hasFaultInjection, httpFault);
rdsNames.add(rds.getRouteConfigName());
} else {
nackResponse(ResourceType.LDS, nonce,
Expand Down
Loading