mirror of https://github.com/grpc/grpc-java.git
xds: ClusterManagerLoadBalancer to use acceptResolvedAddresses() (#9572)
Part of an API migration away from handleResolvedAddresses().
This commit is contained in:
parent
8473e270eb
commit
ab78f39f23
|
@ -70,16 +70,16 @@ class ClusterManagerLoadBalancer extends LoadBalancer {
|
|||
}
|
||||
|
||||
@Override
|
||||
public void handleResolvedAddresses(ResolvedAddresses resolvedAddresses) {
|
||||
public boolean acceptResolvedAddresses(ResolvedAddresses resolvedAddresses) {
|
||||
try {
|
||||
resolvingAddresses = true;
|
||||
handleResolvedAddressesInternal(resolvedAddresses);
|
||||
return acceptResolvedAddressesInternal(resolvedAddresses);
|
||||
} finally {
|
||||
resolvingAddresses = false;
|
||||
}
|
||||
}
|
||||
|
||||
public void handleResolvedAddressesInternal(ResolvedAddresses resolvedAddresses) {
|
||||
public boolean acceptResolvedAddressesInternal(ResolvedAddresses resolvedAddresses) {
|
||||
logger.log(XdsLogLevel.DEBUG, "Received resolution result: {0}", resolvedAddresses);
|
||||
ClusterManagerConfig config = (ClusterManagerConfig)
|
||||
resolvedAddresses.getLoadBalancingPolicyConfig();
|
||||
|
@ -109,6 +109,7 @@ class ClusterManagerLoadBalancer extends LoadBalancer {
|
|||
// Must update channel picker before return so that new RPCs will not be routed to deleted
|
||||
// clusters and resolver can remove them in service config.
|
||||
updateOverallBalancingState();
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -126,11 +127,6 @@ class ClusterManagerLoadBalancer extends LoadBalancer {
|
|||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canHandleEmptyAddressListFromNameResolution() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void shutdown() {
|
||||
logger.log(XdsLogLevel.INFO, "Shutdown");
|
||||
|
|
|
@ -267,7 +267,7 @@ public class ClusterManagerLoadBalancerTest {
|
|||
}
|
||||
|
||||
private void deliverResolvedAddresses(final Map<String, String> childPolicies, boolean failing) {
|
||||
clusterManagerLoadBalancer.handleResolvedAddresses(
|
||||
clusterManagerLoadBalancer.acceptResolvedAddresses(
|
||||
ResolvedAddresses.newBuilder()
|
||||
.setAddresses(Collections.<EquivalentAddressGroup>emptyList())
|
||||
.setLoadBalancingPolicyConfig(buildConfig(childPolicies, failing))
|
||||
|
@ -348,12 +348,13 @@ public class ClusterManagerLoadBalancerTest {
|
|||
}
|
||||
|
||||
@Override
|
||||
public void handleResolvedAddresses(ResolvedAddresses resolvedAddresses) {
|
||||
public boolean acceptResolvedAddresses(ResolvedAddresses resolvedAddresses) {
|
||||
config = resolvedAddresses.getLoadBalancingPolicyConfig();
|
||||
|
||||
if (failing) {
|
||||
helper.updateBalancingState(TRANSIENT_FAILURE, new ErrorPicker(Status.INTERNAL));
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
Loading…
Reference in New Issue