Skip to content

Commit 3b63af4

Browse files
ejona86ejona86
committed
Revert "xds: Add logical dns cluster support to XdsDepManager"
This reverts commit d2d8ed8 as part of reverting 297ab05.
1 parent f3daf93 commit 3b63af4

8 files changed

Lines changed: 36 additions & 324 deletions

File tree

‎api/src/main/java/io/grpc/NameResolver.java‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,6 @@ public static final class Args {
303303
@Nullable private final Executor executor;
304304
@Nullable private final String overrideAuthority;
305305
@Nullable private final MetricRecorder metricRecorder;
306-
@Nullable private final NameResolverRegistry nameResolverRegistry;
307306
@Nullable private final IdentityHashMap<Key<?>, Object> customArgs;
308307

309308
private Args(Builder builder) {
@@ -317,7 +316,6 @@ private Args(Builder builder) {
317316
this.executor = builder.executor;
318317
this.overrideAuthority = builder.overrideAuthority;
319318
this.metricRecorder = builder.metricRecorder;
320-
this.nameResolverRegistry = builder.nameResolverRegistry;
321319
this.customArgs = cloneCustomArgs(builder.customArgs);
322320
}
323321

@@ -449,18 +447,6 @@ public MetricRecorder getMetricRecorder() {
449447
return metricRecorder;
450448
}
451449

452-
/**
453-
* Returns the {@link NameResolverRegistry} that the Channel uses to look for {@link
454-
* NameResolver}s.
455-
*
456-
* @since 1.74.0
457-
*/
458-
public NameResolverRegistry getNameResolverRegistry() {
459-
if (nameResolverRegistry == null) {
460-
throw new IllegalStateException("NameResolverRegistry is not set in Builder");
461-
}
462-
return nameResolverRegistry;
463-
}
464450

465451
@Override
466452
public String toString() {
@@ -475,7 +461,6 @@ public String toString() {
475461
.add("executor", executor)
476462
.add("overrideAuthority", overrideAuthority)
477463
.add("metricRecorder", metricRecorder)
478-
.add("nameResolverRegistry", nameResolverRegistry)
479464
.toString();
480465
}
481466

@@ -495,7 +480,6 @@ public Builder toBuilder() {
495480
builder.setOffloadExecutor(executor);
496481
builder.setOverrideAuthority(overrideAuthority);
497482
builder.setMetricRecorder(metricRecorder);
498-
builder.setNameResolverRegistry(nameResolverRegistry);
499483
builder.customArgs = cloneCustomArgs(customArgs);
500484
return builder;
501485
}
@@ -524,7 +508,6 @@ public static final class Builder {
524508
private Executor executor;
525509
private String overrideAuthority;
526510
private MetricRecorder metricRecorder;
527-
private NameResolverRegistry nameResolverRegistry;
528511
private IdentityHashMap<Key<?>, Object> customArgs;
529512

530513
Builder() {
@@ -631,16 +614,6 @@ public Builder setMetricRecorder(MetricRecorder metricRecorder) {
631614
return this;
632615
}
633616

634-
/**
635-
* See {@link Args#getNameResolverRegistry}. This is an optional field.
636-
*
637-
* @since 1.74.0
638-
*/
639-
public Builder setNameResolverRegistry(NameResolverRegistry registry) {
640-
this.nameResolverRegistry = registry;
641-
return this;
642-
}
643-
644617
/**
645618
* Builds an {@link Args}.
646619
*

‎core/src/main/java/io/grpc/internal/ManagedChannelImpl.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -597,8 +597,7 @@ ClientStream newSubstream(
597597
.setChannelLogger(channelLogger)
598598
.setOffloadExecutor(this.offloadExecutorHolder)
599599
.setOverrideAuthority(this.authorityOverride)
600-
.setMetricRecorder(this.metricRecorder)
601-
.setNameResolverRegistry(builder.nameResolverRegistry);
600+
.setMetricRecorder(this.metricRecorder);
602601
builder.copyAllNameResolverCustomArgsTo(nameResolverArgsBuilder);
603602
this.nameResolverArgs = nameResolverArgsBuilder.build();
604603
this.nameResolver = getNameResolver(
@@ -686,7 +685,11 @@ static NameResolver getNameResolver(
686685
// We wrap the name resolver in a RetryingNameResolver to give it the ability to retry failures.
687686
// TODO: After a transition period, all NameResolver implementations that need retry should use
688687
// RetryingNameResolver directly and this step can be removed.
689-
NameResolver usedNameResolver = RetryingNameResolver.wrap(resolver, nameResolverArgs);
688+
NameResolver usedNameResolver = new RetryingNameResolver(resolver,
689+
new BackoffPolicyRetryScheduler(new ExponentialBackoffPolicy.Provider(),
690+
nameResolverArgs.getScheduledExecutorService(),
691+
nameResolverArgs.getSynchronizationContext()),
692+
nameResolverArgs.getSynchronizationContext());
690693

691694
if (overrideAuthority == null) {
692695
return usedNameResolver;

‎core/src/main/java/io/grpc/internal/RetryingNameResolver.java‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,13 @@
2727
*
2828
* <p>The {@link NameResolver} used with this
2929
*/
30-
public final class RetryingNameResolver extends ForwardingNameResolver {
31-
public static NameResolver wrap(NameResolver retriedNameResolver, Args args) {
32-
// For migration, this might become conditional
33-
return new RetryingNameResolver(
34-
retriedNameResolver,
35-
new BackoffPolicyRetryScheduler(
36-
new ExponentialBackoffPolicy.Provider(),
37-
args.getScheduledExecutorService(),
38-
args.getSynchronizationContext()),
39-
args.getSynchronizationContext());
40-
}
30+
final class RetryingNameResolver extends ForwardingNameResolver {
4131

4232
private final NameResolver retriedNameResolver;
4333
private final RetryScheduler retryScheduler;
4434
private final SynchronizationContext syncContext;
4535

36+
4637
/**
4738
* Creates a new {@link RetryingNameResolver}.
4839
*

‎core/src/test/java/io/grpc/internal/DnsNameResolverTest.java‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,14 @@ private RetryingNameResolver newResolver(
207207

208208
// In practice the DNS name resolver provider always wraps the resolver in a
209209
// RetryingNameResolver which adds retry capabilities to it. We use the same setup here.
210-
return (RetryingNameResolver) RetryingNameResolver.wrap(dnsResolver, args);
210+
return new RetryingNameResolver(
211+
dnsResolver,
212+
new BackoffPolicyRetryScheduler(
213+
new ExponentialBackoffPolicy.Provider(),
214+
fakeExecutor.getScheduledExecutorService(),
215+
syncContext
216+
),
217+
syncContext);
211218
}
212219

213220
@Before

0 commit comments

Comments
 (0)