mirror of https://github.com/grpc/grpc-java.git
Revert "xds: Add logical dns cluster support to XdsDepManager"
This reverts commitd2d8ed8efaas part of reverting297ab05efe.
This commit is contained in:
Eric Anderson
parent
f3daf93ce5
commit
3b63af411d
|
|
@ -303,7 +303,6 @@ public abstract class NameResolver {
|
|||
@Nullable private final Executor executor;
|
||||
@Nullable private final String overrideAuthority;
|
||||
@Nullable private final MetricRecorder metricRecorder;
|
||||
@Nullable private final NameResolverRegistry nameResolverRegistry;
|
||||
@Nullable private final IdentityHashMap<Key<?>, Object> customArgs;
|
||||
|
||||
private Args(Builder builder) {
|
||||
|
|
@ -317,7 +316,6 @@ public abstract class NameResolver {
|
|||
this.executor = builder.executor;
|
||||
this.overrideAuthority = builder.overrideAuthority;
|
||||
this.metricRecorder = builder.metricRecorder;
|
||||
this.nameResolverRegistry = builder.nameResolverRegistry;
|
||||
this.customArgs = cloneCustomArgs(builder.customArgs);
|
||||
}
|
||||
|
||||
|
|
@ -449,18 +447,6 @@ public abstract class NameResolver {
|
|||
return metricRecorder;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the {@link NameResolverRegistry} that the Channel uses to look for {@link
|
||||
* NameResolver}s.
|
||||
*
|
||||
* @since 1.74.0
|
||||
*/
|
||||
public NameResolverRegistry getNameResolverRegistry() {
|
||||
if (nameResolverRegistry == null) {
|
||||
throw new IllegalStateException("NameResolverRegistry is not set in Builder");
|
||||
}
|
||||
return nameResolverRegistry;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
|
|
@ -475,7 +461,6 @@ public abstract class NameResolver {
|
|||
.add("executor", executor)
|
||||
.add("overrideAuthority", overrideAuthority)
|
||||
.add("metricRecorder", metricRecorder)
|
||||
.add("nameResolverRegistry", nameResolverRegistry)
|
||||
.toString();
|
||||
}
|
||||
|
||||
|
|
@ -495,7 +480,6 @@ public abstract class NameResolver {
|
|||
builder.setOffloadExecutor(executor);
|
||||
builder.setOverrideAuthority(overrideAuthority);
|
||||
builder.setMetricRecorder(metricRecorder);
|
||||
builder.setNameResolverRegistry(nameResolverRegistry);
|
||||
builder.customArgs = cloneCustomArgs(customArgs);
|
||||
return builder;
|
||||
}
|
||||
|
|
@ -524,7 +508,6 @@ public abstract class NameResolver {
|
|||
private Executor executor;
|
||||
private String overrideAuthority;
|
||||
private MetricRecorder metricRecorder;
|
||||
private NameResolverRegistry nameResolverRegistry;
|
||||
private IdentityHashMap<Key<?>, Object> customArgs;
|
||||
|
||||
Builder() {
|
||||
|
|
@ -631,16 +614,6 @@ public abstract class NameResolver {
|
|||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* See {@link Args#getNameResolverRegistry}. This is an optional field.
|
||||
*
|
||||
* @since 1.74.0
|
||||
*/
|
||||
public Builder setNameResolverRegistry(NameResolverRegistry registry) {
|
||||
this.nameResolverRegistry = registry;
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Builds an {@link Args}.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -597,8 +597,7 @@ final class ManagedChannelImpl extends ManagedChannel implements
|
|||
.setChannelLogger(channelLogger)
|
||||
.setOffloadExecutor(this.offloadExecutorHolder)
|
||||
.setOverrideAuthority(this.authorityOverride)
|
||||
.setMetricRecorder(this.metricRecorder)
|
||||
.setNameResolverRegistry(builder.nameResolverRegistry);
|
||||
.setMetricRecorder(this.metricRecorder);
|
||||
builder.copyAllNameResolverCustomArgsTo(nameResolverArgsBuilder);
|
||||
this.nameResolverArgs = nameResolverArgsBuilder.build();
|
||||
this.nameResolver = getNameResolver(
|
||||
|
|
@ -686,7 +685,11 @@ final class ManagedChannelImpl extends ManagedChannel implements
|
|||
// We wrap the name resolver in a RetryingNameResolver to give it the ability to retry failures.
|
||||
// TODO: After a transition period, all NameResolver implementations that need retry should use
|
||||
// RetryingNameResolver directly and this step can be removed.
|
||||
NameResolver usedNameResolver = RetryingNameResolver.wrap(resolver, nameResolverArgs);
|
||||
NameResolver usedNameResolver = new RetryingNameResolver(resolver,
|
||||
new BackoffPolicyRetryScheduler(new ExponentialBackoffPolicy.Provider(),
|
||||
nameResolverArgs.getScheduledExecutorService(),
|
||||
nameResolverArgs.getSynchronizationContext()),
|
||||
nameResolverArgs.getSynchronizationContext());
|
||||
|
||||
if (overrideAuthority == null) {
|
||||
return usedNameResolver;
|
||||
|
|
|
|||
|
|
@ -27,22 +27,13 @@ import io.grpc.SynchronizationContext;
|
|||
*
|
||||
* <p>The {@link NameResolver} used with this
|
||||
*/
|
||||
public final class RetryingNameResolver extends ForwardingNameResolver {
|
||||
public static NameResolver wrap(NameResolver retriedNameResolver, Args args) {
|
||||
// For migration, this might become conditional
|
||||
return new RetryingNameResolver(
|
||||
retriedNameResolver,
|
||||
new BackoffPolicyRetryScheduler(
|
||||
new ExponentialBackoffPolicy.Provider(),
|
||||
args.getScheduledExecutorService(),
|
||||
args.getSynchronizationContext()),
|
||||
args.getSynchronizationContext());
|
||||
}
|
||||
final class RetryingNameResolver extends ForwardingNameResolver {
|
||||
|
||||
private final NameResolver retriedNameResolver;
|
||||
private final RetryScheduler retryScheduler;
|
||||
private final SynchronizationContext syncContext;
|
||||
|
||||
|
||||
/**
|
||||
* Creates a new {@link RetryingNameResolver}.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -207,7 +207,14 @@ public class DnsNameResolverTest {
|
|||
|
||||
// In practice the DNS name resolver provider always wraps the resolver in a
|
||||
// RetryingNameResolver which adds retry capabilities to it. We use the same setup here.
|
||||
return (RetryingNameResolver) RetryingNameResolver.wrap(dnsResolver, args);
|
||||
return new RetryingNameResolver(
|
||||
dnsResolver,
|
||||
new BackoffPolicyRetryScheduler(
|
||||
new ExponentialBackoffPolicy.Provider(),
|
||||
fakeExecutor.getScheduledExecutorService(),
|
||||
syncContext
|
||||
),
|
||||
syncContext);
|
||||
}
|
||||
|
||||
@Before
|
||||
|
|
|
|||
|
|
@ -23,27 +23,18 @@ import static io.grpc.xds.client.XdsClient.ResourceUpdate;
|
|||
|
||||
import com.google.common.annotations.VisibleForTesting;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import io.grpc.EquivalentAddressGroup;
|
||||
import io.grpc.NameResolver;
|
||||
import io.grpc.NameResolverProvider;
|
||||
import io.grpc.Status;
|
||||
import io.grpc.StatusOr;
|
||||
import io.grpc.SynchronizationContext;
|
||||
import io.grpc.internal.RetryingNameResolver;
|
||||
import io.grpc.xds.Endpoints.LocalityLbEndpoints;
|
||||
import io.grpc.xds.VirtualHost.Route.RouteAction.ClusterWeight;
|
||||
import io.grpc.xds.XdsClusterResource.CdsUpdate.ClusterType;
|
||||
import io.grpc.xds.XdsConfig.XdsClusterConfig.AggregateConfig;
|
||||
import io.grpc.xds.XdsConfig.XdsClusterConfig.EndpointConfig;
|
||||
import io.grpc.xds.XdsRouteConfigureResource.RdsUpdate;
|
||||
import io.grpc.xds.client.Locality;
|
||||
import io.grpc.xds.client.XdsClient;
|
||||
import io.grpc.xds.client.XdsClient.ResourceWatcher;
|
||||
import io.grpc.xds.client.XdsResourceType;
|
||||
import java.net.URI;
|
||||
import java.net.URISyntaxException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.EnumMap;
|
||||
import java.util.HashMap;
|
||||
|
|
@ -53,6 +44,7 @@ import java.util.List;
|
|||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.ScheduledExecutorService;
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
/**
|
||||
|
|
@ -63,7 +55,7 @@ import javax.annotation.Nullable;
|
|||
*/
|
||||
final class XdsDependencyManager implements XdsConfig.XdsClusterSubscriptionRegistry {
|
||||
private enum TrackedWatcherTypeEnum {
|
||||
LDS, RDS, CDS, EDS, DNS
|
||||
LDS, RDS, CDS, EDS
|
||||
}
|
||||
|
||||
private static final TrackedWatcherType<XdsListenerResource.LdsUpdate> LDS_TYPE =
|
||||
|
|
@ -74,19 +66,12 @@ final class XdsDependencyManager implements XdsConfig.XdsClusterSubscriptionRegi
|
|||
new TrackedWatcherType<>(TrackedWatcherTypeEnum.CDS);
|
||||
private static final TrackedWatcherType<XdsEndpointResource.EdsUpdate> EDS_TYPE =
|
||||
new TrackedWatcherType<>(TrackedWatcherTypeEnum.EDS);
|
||||
private static final TrackedWatcherType<List<EquivalentAddressGroup>> DNS_TYPE =
|
||||
new TrackedWatcherType<>(TrackedWatcherTypeEnum.DNS);
|
||||
|
||||
// DNS-resolved endpoints do not have the definition of the locality it belongs to, just hardcode
|
||||
// to an empty locality.
|
||||
private static final Locality LOGICAL_DNS_CLUSTER_LOCALITY = Locality.create("", "", "");
|
||||
|
||||
private static final int MAX_CLUSTER_RECURSION_DEPTH = 16; // Specified by gRFC A37
|
||||
private final String listenerName;
|
||||
private final XdsClient xdsClient;
|
||||
private final SynchronizationContext syncContext;
|
||||
private final String dataPlaneAuthority;
|
||||
private final NameResolver.Args nameResolverArgs;
|
||||
private XdsConfigWatcher xdsConfigWatcher;
|
||||
|
||||
private StatusOr<XdsConfig> lastUpdate = null;
|
||||
|
|
@ -94,17 +79,16 @@ final class XdsDependencyManager implements XdsConfig.XdsClusterSubscriptionRegi
|
|||
new EnumMap<>(TrackedWatcherTypeEnum.class);
|
||||
private final Set<ClusterSubscription> subscriptions = new HashSet<>();
|
||||
|
||||
XdsDependencyManager(
|
||||
XdsClient xdsClient,
|
||||
SynchronizationContext syncContext,
|
||||
String dataPlaneAuthority,
|
||||
String listenerName,
|
||||
NameResolver.Args nameResolverArgs) {
|
||||
XdsDependencyManager(XdsClient xdsClient,
|
||||
SynchronizationContext syncContext, String dataPlaneAuthority,
|
||||
String listenerName, NameResolver.Args nameResolverArgs,
|
||||
ScheduledExecutorService scheduler) {
|
||||
this.listenerName = checkNotNull(listenerName, "listenerName");
|
||||
this.xdsClient = checkNotNull(xdsClient, "xdsClient");
|
||||
this.syncContext = checkNotNull(syncContext, "syncContext");
|
||||
this.dataPlaneAuthority = checkNotNull(dataPlaneAuthority, "dataPlaneAuthority");
|
||||
this.nameResolverArgs = checkNotNull(nameResolverArgs, "nameResolverArgs");
|
||||
checkNotNull(nameResolverArgs, "nameResolverArgs");
|
||||
checkNotNull(scheduler, "scheduler");
|
||||
}
|
||||
|
||||
public static String toContextStr(String typeName, String resourceName) {
|
||||
|
|
@ -136,18 +120,6 @@ final class XdsDependencyManager implements XdsConfig.XdsClusterSubscriptionRegi
|
|||
return subscription;
|
||||
}
|
||||
|
||||
/**
|
||||
* For all logical dns clusters refresh their results.
|
||||
*/
|
||||
public void requestReresolution() {
|
||||
syncContext.execute(() -> {
|
||||
for (TrackedWatcher<List<EquivalentAddressGroup>> watcher : getWatchers(DNS_TYPE).values()) {
|
||||
DnsWatcher dnsWatcher = (DnsWatcher) watcher;
|
||||
dnsWatcher.refresh();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private <T extends ResourceUpdate> void addWatcher(
|
||||
TrackedWatcherType<T> watcherType, XdsWatcherBase<T> watcher) {
|
||||
syncContext.throwIfNotInThisSynchronizationContext();
|
||||
|
|
@ -363,9 +335,9 @@ final class XdsDependencyManager implements XdsConfig.XdsClusterSubscriptionRegi
|
|||
}
|
||||
break;
|
||||
case LOGICAL_DNS:
|
||||
TrackedWatcher<List<EquivalentAddressGroup>> dnsWatcher =
|
||||
tracer.getWatcher(DNS_TYPE, cdsUpdate.dnsHostName());
|
||||
child = new EndpointConfig(dnsToEdsUpdate(dnsWatcher.getData(), cdsUpdate.dnsHostName()));
|
||||
// TODO get the resolved endpoint configuration
|
||||
child = new EndpointConfig(StatusOr.fromStatus(
|
||||
Status.INTERNAL.withDescription("Logical DNS in dependency manager unsupported")));
|
||||
break;
|
||||
default:
|
||||
child = new EndpointConfig(StatusOr.fromStatus(Status.UNAVAILABLE.withDescription(
|
||||
|
|
@ -380,24 +352,6 @@ final class XdsDependencyManager implements XdsConfig.XdsClusterSubscriptionRegi
|
|||
new XdsConfig.XdsClusterConfig(clusterName, cdsUpdate, child)));
|
||||
}
|
||||
|
||||
private static StatusOr<XdsEndpointResource.EdsUpdate> dnsToEdsUpdate(
|
||||
StatusOr<List<EquivalentAddressGroup>> dnsData, String dnsHostName) {
|
||||
if (!dnsData.hasValue()) {
|
||||
return StatusOr.fromStatus(dnsData.getStatus());
|
||||
}
|
||||
|
||||
List<Endpoints.LbEndpoint> endpoints = new ArrayList<>();
|
||||
for (EquivalentAddressGroup eag : dnsData.getValue()) {
|
||||
endpoints.add(Endpoints.LbEndpoint.create(eag, 1, true, dnsHostName, ImmutableMap.of()));
|
||||
}
|
||||
LocalityLbEndpoints lbEndpoints =
|
||||
LocalityLbEndpoints.create(endpoints, 1, 0, ImmutableMap.of());
|
||||
return StatusOr.fromValue(new XdsEndpointResource.EdsUpdate(
|
||||
"fakeEds_logicalDns",
|
||||
Collections.singletonMap(LOGICAL_DNS_CLUSTER_LOCALITY, lbEndpoints),
|
||||
new ArrayList<>()));
|
||||
}
|
||||
|
||||
private void addRdsWatcher(String resourceName) {
|
||||
if (getWatchers(RDS_TYPE).containsKey(resourceName)) {
|
||||
return;
|
||||
|
|
@ -422,17 +376,6 @@ final class XdsDependencyManager implements XdsConfig.XdsClusterSubscriptionRegi
|
|||
addWatcher(CDS_TYPE, new CdsWatcher(clusterName));
|
||||
}
|
||||
|
||||
private void addDnsWatcher(String dnsHostName) {
|
||||
syncContext.throwIfNotInThisSynchronizationContext();
|
||||
if (getWatchers(DNS_TYPE).containsKey(dnsHostName)) {
|
||||
return;
|
||||
}
|
||||
|
||||
DnsWatcher watcher = new DnsWatcher(dnsHostName, nameResolverArgs);
|
||||
getWatchers(DNS_TYPE).put(dnsHostName, watcher);
|
||||
watcher.start();
|
||||
}
|
||||
|
||||
private void updateRoutes(List<VirtualHost> virtualHosts) {
|
||||
VirtualHost virtualHost =
|
||||
RoutingUtils.findVirtualHostForHostName(virtualHosts, dataPlaneAuthority);
|
||||
|
|
@ -468,33 +411,6 @@ final class XdsDependencyManager implements XdsConfig.XdsClusterSubscriptionRegi
|
|||
return clusters;
|
||||
}
|
||||
|
||||
private static NameResolver createNameResolver(
|
||||
String dnsHostName,
|
||||
NameResolver.Args nameResolverArgs) {
|
||||
URI uri;
|
||||
try {
|
||||
uri = new URI("dns", "", "/" + dnsHostName, null);
|
||||
} catch (URISyntaxException e) {
|
||||
return new FailingNameResolver(
|
||||
Status.INTERNAL.withDescription("Bug, invalid URI creation: " + dnsHostName)
|
||||
.withCause(e));
|
||||
}
|
||||
|
||||
NameResolverProvider provider =
|
||||
nameResolverArgs.getNameResolverRegistry().getProviderForScheme("dns");
|
||||
if (provider == null) {
|
||||
return new FailingNameResolver(
|
||||
Status.INTERNAL.withDescription("Could not find dns name resolver"));
|
||||
}
|
||||
|
||||
NameResolver bareResolver = provider.newNameResolver(uri, nameResolverArgs);
|
||||
if (bareResolver == null) {
|
||||
return new FailingNameResolver(
|
||||
Status.INTERNAL.withDescription("DNS name resolver provider returned null: " + uri));
|
||||
}
|
||||
return RetryingNameResolver.wrap(bareResolver, nameResolverArgs);
|
||||
}
|
||||
|
||||
private static class TypeWatchers<T> {
|
||||
// Key is resource name
|
||||
final Map<String, TrackedWatcher<T>> watchers = new HashMap<>();
|
||||
|
|
@ -806,7 +722,7 @@ final class XdsDependencyManager implements XdsConfig.XdsClusterSubscriptionRegi
|
|||
addEdsWatcher(getEdsServiceName());
|
||||
break;
|
||||
case LOGICAL_DNS:
|
||||
addDnsWatcher(update.dnsHostName());
|
||||
// no eds needed
|
||||
break;
|
||||
case AGGREGATE:
|
||||
update.prioritizedClusterNames()
|
||||
|
|
@ -835,101 +751,4 @@ final class XdsDependencyManager implements XdsConfig.XdsClusterSubscriptionRegi
|
|||
@Override
|
||||
public void subscribeToChildren(XdsEndpointResource.EdsUpdate update) {}
|
||||
}
|
||||
|
||||
private final class DnsWatcher implements TrackedWatcher<List<EquivalentAddressGroup>> {
|
||||
private final NameResolver resolver;
|
||||
@Nullable
|
||||
private StatusOr<List<EquivalentAddressGroup>> data;
|
||||
private boolean cancelled;
|
||||
|
||||
public DnsWatcher(String dnsHostName, NameResolver.Args nameResolverArgs) {
|
||||
this.resolver = createNameResolver(dnsHostName, nameResolverArgs);
|
||||
}
|
||||
|
||||
public void start() {
|
||||
resolver.start(new NameResolverListener());
|
||||
}
|
||||
|
||||
public void refresh() {
|
||||
if (cancelled) {
|
||||
return;
|
||||
}
|
||||
resolver.refresh();
|
||||
}
|
||||
|
||||
@Override
|
||||
@Nullable
|
||||
public StatusOr<List<EquivalentAddressGroup>> getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void close() {
|
||||
if (cancelled) {
|
||||
return;
|
||||
}
|
||||
cancelled = true;
|
||||
resolver.shutdown();
|
||||
}
|
||||
|
||||
private class NameResolverListener extends NameResolver.Listener2 {
|
||||
@Override
|
||||
public void onResult(final NameResolver.ResolutionResult resolutionResult) {
|
||||
syncContext.execute(() -> onResult2(resolutionResult));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Status onResult2(final NameResolver.ResolutionResult resolutionResult) {
|
||||
if (cancelled) {
|
||||
return Status.OK;
|
||||
}
|
||||
data = resolutionResult.getAddressesOrError();
|
||||
maybePublishConfig();
|
||||
return resolutionResult.getAddressesOrError().getStatus();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onError(final Status error) {
|
||||
syncContext.execute(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
if (cancelled) {
|
||||
return;
|
||||
}
|
||||
// DnsNameResolver cannot distinguish between address-not-found and transient errors.
|
||||
// Assume it is a transient error.
|
||||
// TODO: Once the resolution note API is available, don't throw away the error if
|
||||
// hasDataValue(); pass it as the note instead
|
||||
if (!hasDataValue()) {
|
||||
data = StatusOr.fromStatus(error);
|
||||
maybePublishConfig();
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static final class FailingNameResolver extends NameResolver {
|
||||
private final Status status;
|
||||
|
||||
public FailingNameResolver(Status status) {
|
||||
checkNotNull(status, "status");
|
||||
checkArgument(!status.isOk(), "Status must not be OK");
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void start(Listener2 listener) {
|
||||
listener.onError(status);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getServiceAuthority() {
|
||||
return "bug-if-you-see-this-authority";
|
||||
}
|
||||
|
||||
@Override
|
||||
public void shutdown() {}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -655,7 +655,7 @@ final class XdsNameResolver extends NameResolver {
|
|||
authority = overrideAuthority != null ? overrideAuthority : encodedServiceAuthority;
|
||||
xdsDependencyManager =
|
||||
new XdsDependencyManager(xdsClient, syncContext, authority, ldsResourceName,
|
||||
nameResolverArgs);
|
||||
nameResolverArgs, scheduler);
|
||||
}
|
||||
|
||||
void start() {
|
||||
|
|
|
|||
|
|
@ -66,7 +66,6 @@ import io.grpc.LoadBalancer.SubchannelPicker;
|
|||
import io.grpc.LoadBalancerProvider;
|
||||
import io.grpc.LoadBalancerRegistry;
|
||||
import io.grpc.NameResolver;
|
||||
import io.grpc.NameResolverRegistry;
|
||||
import io.grpc.Status;
|
||||
import io.grpc.Status.Code;
|
||||
import io.grpc.SynchronizationContext;
|
||||
|
|
@ -177,7 +176,6 @@ public class CdsLoadBalancer2Test {
|
|||
.setServiceConfigParser(mock(NameResolver.ServiceConfigParser.class))
|
||||
.setChannelLogger(mock(ChannelLogger.class))
|
||||
.setScheduledExecutorService(fakeClock.getScheduledExecutorService())
|
||||
.setNameResolverRegistry(new NameResolverRegistry())
|
||||
.build();
|
||||
|
||||
xdsDepManager = new XdsDependencyManager(
|
||||
|
|
@ -185,7 +183,8 @@ public class CdsLoadBalancer2Test {
|
|||
syncContext,
|
||||
SERVER_NAME,
|
||||
SERVER_NAME,
|
||||
nameResolverArgs);
|
||||
nameResolverArgs,
|
||||
fakeClock.getScheduledExecutorService());
|
||||
|
||||
controlPlaneService.setXdsConfig(ADS_TYPE_URL_LDS, ImmutableMap.of(
|
||||
SERVER_NAME, ControlPlaneRule.buildClientListener(SERVER_NAME, "my-route")));
|
||||
|
|
|
|||
|
|
@ -42,19 +42,12 @@ import com.google.common.collect.ImmutableSet;
|
|||
import com.google.common.util.concurrent.MoreExecutors;
|
||||
import com.google.protobuf.Message;
|
||||
import io.envoyproxy.envoy.config.cluster.v3.Cluster;
|
||||
import io.envoyproxy.envoy.config.core.v3.Address;
|
||||
import io.envoyproxy.envoy.config.core.v3.SocketAddress;
|
||||
import io.envoyproxy.envoy.config.endpoint.v3.ClusterLoadAssignment;
|
||||
import io.envoyproxy.envoy.config.endpoint.v3.Endpoint;
|
||||
import io.envoyproxy.envoy.config.endpoint.v3.LbEndpoint;
|
||||
import io.envoyproxy.envoy.config.endpoint.v3.LocalityLbEndpoints;
|
||||
import io.envoyproxy.envoy.config.listener.v3.Listener;
|
||||
import io.envoyproxy.envoy.config.route.v3.RouteConfiguration;
|
||||
import io.grpc.BindableService;
|
||||
import io.grpc.ChannelLogger;
|
||||
import io.grpc.EquivalentAddressGroup;
|
||||
import io.grpc.NameResolver;
|
||||
import io.grpc.NameResolverRegistry;
|
||||
import io.grpc.Status;
|
||||
import io.grpc.StatusOr;
|
||||
import io.grpc.StatusOrMatcher;
|
||||
|
|
@ -63,12 +56,10 @@ import io.grpc.inprocess.InProcessChannelBuilder;
|
|||
import io.grpc.inprocess.InProcessServerBuilder;
|
||||
import io.grpc.internal.FakeClock;
|
||||
import io.grpc.internal.GrpcUtil;
|
||||
import io.grpc.internal.testing.FakeNameResolverProvider;
|
||||
import io.grpc.testing.GrpcCleanupRule;
|
||||
import io.grpc.xds.XdsClusterResource.CdsUpdate;
|
||||
import io.grpc.xds.XdsConfig.XdsClusterConfig;
|
||||
import io.grpc.xds.XdsEndpointResource.EdsUpdate;
|
||||
import io.grpc.xds.client.Locality;
|
||||
import io.grpc.xds.client.XdsClient;
|
||||
import io.grpc.xds.client.XdsClient.ResourceMetadata;
|
||||
import io.grpc.xds.client.XdsResourceType;
|
||||
|
|
@ -83,6 +74,7 @@ import java.util.List;
|
|||
import java.util.Map;
|
||||
import java.util.Queue;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.ScheduledExecutorService;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
import java.util.logging.Logger;
|
||||
|
|
@ -129,7 +121,6 @@ public class XdsDependencyManagerTest {
|
|||
private final XdsTestControlPlaneService controlPlaneService = new XdsTestControlPlaneService();
|
||||
private final BindableService lrsService =
|
||||
XdsTestUtils.createLrsService(lrsEnded, loadReportCalls);
|
||||
private final NameResolverRegistry nameResolverRegistry = new NameResolverRegistry();
|
||||
|
||||
@Rule
|
||||
public final GrpcCleanupRule cleanupRule = new GrpcCleanupRule();
|
||||
|
|
@ -147,11 +138,11 @@ public class XdsDependencyManagerTest {
|
|||
.setServiceConfigParser(mock(NameResolver.ServiceConfigParser.class))
|
||||
.setChannelLogger(mock(ChannelLogger.class))
|
||||
.setScheduledExecutorService(fakeClock.getScheduledExecutorService())
|
||||
.setNameResolverRegistry(nameResolverRegistry)
|
||||
.build();
|
||||
|
||||
private final ScheduledExecutorService scheduler = fakeClock.getScheduledExecutorService();
|
||||
private XdsDependencyManager xdsDependencyManager = new XdsDependencyManager(
|
||||
xdsClient, syncContext, serverName, serverName, nameResolverArgs);
|
||||
xdsClient, syncContext, serverName, serverName, nameResolverArgs, scheduler);
|
||||
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
|
|
@ -378,7 +369,7 @@ public class XdsDependencyManagerTest {
|
|||
public void testMissingLds() {
|
||||
String ldsName = "badLdsName";
|
||||
xdsDependencyManager = new XdsDependencyManager(xdsClient, syncContext,
|
||||
serverName, ldsName, nameResolverArgs);
|
||||
serverName, ldsName, nameResolverArgs, scheduler);
|
||||
xdsDependencyManager.start(xdsConfigWatcher);
|
||||
|
||||
fakeClock.forwardTime(16, TimeUnit.SECONDS);
|
||||
|
|
@ -443,7 +434,7 @@ public class XdsDependencyManagerTest {
|
|||
"xdstp://unknown.example.com/envoy.config.listener.v3.Listener/listener1";
|
||||
|
||||
xdsDependencyManager = new XdsDependencyManager(xdsClient, syncContext,
|
||||
serverName, ldsResourceName, nameResolverArgs);
|
||||
serverName, ldsResourceName, nameResolverArgs, scheduler);
|
||||
xdsDependencyManager.start(xdsConfigWatcher);
|
||||
|
||||
verify(xdsConfigWatcher).onUpdate(
|
||||
|
|
@ -747,75 +738,6 @@ public class XdsDependencyManagerTest {
|
|||
inOrder.verify(xdsConfigWatcher).onUpdate(argThat(nameMatcher));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testLogicalDns_success() {
|
||||
FakeSocketAddress fakeAddress = new FakeSocketAddress();
|
||||
nameResolverRegistry.register(new FakeNameResolverProvider(
|
||||
"dns:///dns.example.com:1111", fakeAddress));
|
||||
Cluster cluster = Cluster.newBuilder()
|
||||
.setName(CLUSTER_NAME)
|
||||
.setType(Cluster.DiscoveryType.LOGICAL_DNS)
|
||||
.setLoadAssignment(ClusterLoadAssignment.newBuilder()
|
||||
.addEndpoints(LocalityLbEndpoints.newBuilder()
|
||||
.addLbEndpoints(LbEndpoint.newBuilder()
|
||||
.setEndpoint(Endpoint.newBuilder()
|
||||
.setAddress(Address.newBuilder()
|
||||
.setSocketAddress(SocketAddress.newBuilder()
|
||||
.setAddress("dns.example.com")
|
||||
.setPortValue(1111)))))))
|
||||
.build();
|
||||
controlPlaneService.setXdsConfig(ADS_TYPE_URL_CDS,
|
||||
ImmutableMap.of(CLUSTER_NAME, cluster));
|
||||
xdsDependencyManager.start(xdsConfigWatcher);
|
||||
|
||||
verify(xdsConfigWatcher).onUpdate(xdsUpdateCaptor.capture());
|
||||
XdsConfig config = xdsUpdateCaptor.getValue().getValue();
|
||||
XdsClusterConfig.ClusterChild clusterChild =
|
||||
config.getClusters().get(CLUSTER_NAME).getValue().getChildren();
|
||||
assertThat(clusterChild).isInstanceOf(XdsClusterConfig.EndpointConfig.class);
|
||||
StatusOr<EdsUpdate> endpointOr = ((XdsClusterConfig.EndpointConfig) clusterChild).getEndpoint();
|
||||
assertThat(endpointOr.getStatus()).isEqualTo(Status.OK);
|
||||
assertThat(endpointOr.getValue()).isEqualTo(new EdsUpdate(
|
||||
"fakeEds_logicalDns",
|
||||
ImmutableMap.of(
|
||||
Locality.create("", "", ""),
|
||||
Endpoints.LocalityLbEndpoints.create(
|
||||
Arrays.asList(Endpoints.LbEndpoint.create(
|
||||
new EquivalentAddressGroup(fakeAddress),
|
||||
1, true, "dns.example.com:1111", ImmutableMap.of())),
|
||||
1, 0, ImmutableMap.of())),
|
||||
Arrays.asList()));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testLogicalDns_noDnsNr() {
|
||||
Cluster cluster = Cluster.newBuilder()
|
||||
.setName(CLUSTER_NAME)
|
||||
.setType(Cluster.DiscoveryType.LOGICAL_DNS)
|
||||
.setLoadAssignment(ClusterLoadAssignment.newBuilder()
|
||||
.addEndpoints(LocalityLbEndpoints.newBuilder()
|
||||
.addLbEndpoints(LbEndpoint.newBuilder()
|
||||
.setEndpoint(Endpoint.newBuilder()
|
||||
.setAddress(Address.newBuilder()
|
||||
.setSocketAddress(SocketAddress.newBuilder()
|
||||
.setAddress("dns.example.com")
|
||||
.setPortValue(1111)))))))
|
||||
.build();
|
||||
controlPlaneService.setXdsConfig(ADS_TYPE_URL_CDS,
|
||||
ImmutableMap.of(CLUSTER_NAME, cluster));
|
||||
xdsDependencyManager.start(xdsConfigWatcher);
|
||||
|
||||
verify(xdsConfigWatcher).onUpdate(xdsUpdateCaptor.capture());
|
||||
XdsConfig config = xdsUpdateCaptor.getValue().getValue();
|
||||
XdsClusterConfig.ClusterChild clusterChild =
|
||||
config.getClusters().get(CLUSTER_NAME).getValue().getChildren();
|
||||
assertThat(clusterChild).isInstanceOf(XdsClusterConfig.EndpointConfig.class);
|
||||
StatusOr<EdsUpdate> endpointOr = ((XdsClusterConfig.EndpointConfig) clusterChild).getEndpoint();
|
||||
assertThat(endpointOr.getStatus().getCode()).isEqualTo(Status.Code.INTERNAL);
|
||||
assertThat(endpointOr.getStatus().getDescription())
|
||||
.isEqualTo("Could not find dns name resolver");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testCdsError() throws IOException {
|
||||
controlPlaneService.setXdsConfig(
|
||||
|
|
@ -1021,6 +943,4 @@ public class XdsDependencyManagerTest {
|
|||
&& xdsConfig.getClusters().keySet().containsAll(expectedNames);
|
||||
}
|
||||
}
|
||||
|
||||
private static class FakeSocketAddress extends java.net.SocketAddress {}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue