Skip to content

Commit 9256ec1

Browse files
committed
The cluster_resolver LB policy intentionally does not want to trigger a name resolution refresh for the resolver in Channel, so use ignoreRefreshNameResolutionCheck() to avoid false-positive warnings.
1 parent fd1b608 commit 9256ec1

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

xds/src/main/java/io/grpc/xds/ClusterResolverLoadBalancer.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,10 @@ private void handleEndpointResolutionError() {
279279
private final class RefreshableHelper extends ForwardingLoadBalancerHelper {
280280
private final Helper delegate;
281281

282+
@SuppressWarnings("deprecation")
282283
private RefreshableHelper(Helper delegate) {
283284
this.delegate = checkNotNull(delegate, "delegate");
285+
delegate.ignoreRefreshNameResolutionCheck();
284286
}
285287

286288
@Override

xds/src/test/java/io/grpc/xds/ClusterResolverLoadBalancerTest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -452,6 +452,7 @@ public void onlyLogicalDnsCluster_endpointsResolved() {
452452
assertAddressesEqual(Arrays.asList(endpoint1, endpoint2), childBalancer.addresses);
453453
}
454454

455+
@SuppressWarnings("deprecation")
455456
@Test
456457
public void onlyLogicalDnsCluster_handleRefreshNameResolution() {
457458
deliverConfigWithSingleLogicalDnsCluster();
@@ -461,6 +462,7 @@ public void onlyLogicalDnsCluster_handleRefreshNameResolution() {
461462
resolver.deliverEndpointAddresses(Arrays.asList(endpoint1, endpoint2));
462463
assertThat(resolver.refreshCount).isEqualTo(0);
463464
FakeLoadBalancer childBalancer = Iterables.getOnlyElement(childBalancers);
465+
verify(childBalancer.helper).ignoreRefreshNameResolutionCheck();
464466
childBalancer.helper.refreshNameResolution();
465467
assertThat(resolver.refreshCount).isEqualTo(1);
466468
}
@@ -509,6 +511,7 @@ public void onlyLogicalDnsCluster_resolutionError_backoffAndRefresh() {
509511
inOrder.verifyNoMoreInteractions();
510512
}
511513

514+
@SuppressWarnings("deprecation")
512515
@Test
513516
public void onlyLogicalDnsCluster_refreshNameResolutionRaceWithResolutionError() {
514517
InOrder inOrder = Mockito.inOrder(backoffPolicyProvider, backoffPolicy1, backoffPolicy2);
@@ -519,6 +522,7 @@ public void onlyLogicalDnsCluster_refreshNameResolutionRaceWithResolutionError()
519522
FakeLoadBalancer childBalancer = Iterables.getOnlyElement(childBalancers);
520523
assertAddressesEqual(Collections.singletonList(endpoint), childBalancer.addresses);
521524
assertThat(resolver.refreshCount).isEqualTo(0);
525+
verify(childBalancer.helper).ignoreRefreshNameResolutionCheck();
522526

523527
childBalancer.helper.refreshNameResolution();
524528
assertThat(resolver.refreshCount).isEqualTo(1);

0 commit comments

Comments
 (0)