grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

util: MultiChildLb children should always start with a NoResult picker 

That's the obvious default, and all current usages use (something
equivalent to) that default.
This commit is contained in:
Eric Anderson 2024-07-25 15:46:02 -07:00
parent a6f8ebf33d
commit b5989a5401
6 changed files with 21 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
util/src/main/java/io/grpc/util/MultiChildLoadBalancer.java
View File

@ -91,8 +91,7 @@ public abstract class MultiChildLoadBalancer extends LoadBalancer {
if (existingChildLbState != null) {
childLbMap.put(endpoint, existingChildLbState);
} else {
childLbMap.put(endpoint,
createChildLbState(endpoint, null, getInitialPicker(), resolvedAddresses));
childLbMap.put(endpoint, createChildLbState(endpoint, null, resolvedAddresses));
}
}
return childLbMap;
@ -102,8 +101,8 @@ public abstract class MultiChildLoadBalancer extends LoadBalancer {
* Override to create an instance of a subclass.
*/
protected ChildLbState createChildLbState(Object key, Object policyConfig,
SubchannelPicker initialPicker, ResolvedAddresses resolvedAddresses) {
return new ChildLbState(key, pickFirstLbProvider, policyConfig, initialPicker);
ResolvedAddresses resolvedAddresses) {
return new ChildLbState(key, pickFirstLbProvider, policyConfig);
}
/**
@ -187,15 +186,6 @@ public abstract class MultiChildLoadBalancer extends LoadBalancer {
child.lb.handleNameResolutionError(error);
}
/**
* Creates a picker representing the state before any connections have been established.
*
* <p/>Override to produce a custom picker.
*/
protected SubchannelPicker getInitialPicker() {
return new FixedResultPicker(PickResult.withNoResult());
}
/**
* Creates a new picker representing an error status.
*
@ -365,12 +355,10 @@ public abstract class MultiChildLoadBalancer extends LoadBalancer {
private final LoadBalancer lb;
private ConnectivityState currentState;
private SubchannelPicker currentPicker;
private SubchannelPicker currentPicker = new FixedResultPicker(PickResult.withNoResult());
public ChildLbState(Object key, LoadBalancer.Factory policyFactory, Object childConfig,
SubchannelPicker initialPicker) {
public ChildLbState(Object key, LoadBalancer.Factory policyFactory, Object childConfig) {
this.key = key;
this.currentPicker = initialPicker;
this.config = childConfig;
this.lb = policyFactory.newLoadBalancer(createChildHelper());
this.currentState = CONNECTING;

4
util/src/main/java/io/grpc/util/RoundRobinLoadBalancer.java
View File

@ -97,8 +97,8 @@ final class RoundRobinLoadBalancer extends MultiChildLoadBalancer {
@Override
protected ChildLbState createChildLbState(Object key, Object policyConfig,
SubchannelPicker initialPicker, ResolvedAddresses resolvedAddresses) {
return new ChildLbState(key, pickFirstLbProvider, policyConfig, initialPicker) {
ResolvedAddresses resolvedAddresses) {
return new ChildLbState(key, pickFirstLbProvider, policyConfig) {
@Override
protected ChildLbStateHelper createChildHelper() {
return new ChildLbStateHelper() {

6
xds/src/main/java/io/grpc/xds/ClusterManagerLoadBalancer.java
View File

@ -85,7 +85,7 @@ class ClusterManagerLoadBalancer extends MultiChildLoadBalancer {
ChildLbState child = getChildLbState(entry.getKey());
if (child == null) {
child = new ClusterManagerLbState(entry.getKey(),
entry.getValue().getProvider(), entry.getValue().getConfig(), getInitialPicker());
entry.getValue().getProvider(), entry.getValue().getConfig());
}
newChildPolicies.put(entry.getKey(), child);
}
@ -202,8 +202,8 @@ class ClusterManagerLoadBalancer extends MultiChildLoadBalancer {
ScheduledHandle deletionTimer;
public ClusterManagerLbState(Object key, LoadBalancerProvider policyProvider,
Object childConfig, SubchannelPicker initialPicker) {
super(key, policyProvider, childConfig, initialPicker);
Object childConfig) {
super(key, policyProvider, childConfig);
}
@Override

8
xds/src/main/java/io/grpc/xds/LeastRequestLoadBalancer.java
View File

@ -127,8 +127,8 @@ final class LeastRequestLoadBalancer extends MultiChildLoadBalancer {
@Override
protected ChildLbState createChildLbState(Object key, Object policyConfig,
SubchannelPicker initialPicker, ResolvedAddresses unused) {
return new LeastRequestLbState(key, pickFirstLbProvider, policyConfig, initialPicker);
ResolvedAddresses unused) {
return new LeastRequestLbState(key, pickFirstLbProvider, policyConfig);
}
private void updateBalancingState(ConnectivityState state, SubchannelPicker picker) {
@ -321,8 +321,8 @@ final class LeastRequestLoadBalancer extends MultiChildLoadBalancer {
private final AtomicInteger activeRequests = new AtomicInteger(0);
public LeastRequestLbState(Object key, LoadBalancerProvider policyProvider,
Object childConfig, SubchannelPicker initialPicker) {
super(key, policyProvider, childConfig, initialPicker);
Object childConfig) {
super(key, policyProvider, childConfig);
}
int getActiveRequests() {

4
xds/src/main/java/io/grpc/xds/RingHashLoadBalancer.java
View File

@ -228,8 +228,8 @@ final class RingHashLoadBalancer extends MultiChildLoadBalancer {
@Override
protected ChildLbState createChildLbState(Object key, Object policyConfig,
SubchannelPicker initialPicker, ResolvedAddresses resolvedAddresses) {
return new ChildLbState(key, lazyLbFactory, null, EMPTY_PICKER);
ResolvedAddresses resolvedAddresses) {
return new ChildLbState(key, lazyLbFactory, null);
}
private Status validateAddrList(List<EquivalentAddressGroup> addrList) {

11
xds/src/main/java/io/grpc/xds/WeightedRoundRobinLoadBalancer.java
View File

@ -149,9 +149,8 @@ final class WeightedRoundRobinLoadBalancer extends MultiChildLoadBalancer {
@Override
protected ChildLbState createChildLbState(Object key, Object policyConfig,
SubchannelPicker initialPicker, ResolvedAddresses unused) {
ChildLbState childLbState = new WeightedChildLbState(key, pickFirstLbProvider, policyConfig,
initialPicker);
ResolvedAddresses unused) {
ChildLbState childLbState = new WeightedChildLbState(key, pickFirstLbProvider, policyConfig);
return childLbState;
}
@ -290,9 +289,9 @@ final class WeightedRoundRobinLoadBalancer extends MultiChildLoadBalancer {
private OrcaReportListener orcaReportListener;
public WeightedChildLbState(Object key, LoadBalancerProvider policyProvider, Object childConfig,
SubchannelPicker initialPicker) {
super(key, policyProvider, childConfig, initialPicker);
public WeightedChildLbState(
Object key, LoadBalancerProvider policyProvider, Object childConfig) {
super(key, policyProvider, childConfig);
}
@Override