Skip to content

fix(gax-grpc): add pick_first fallback to direct path service config #4143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blakeli0 merged 3 commits into from
Mar 16, 2026
Merged

fix(gax-grpc): add pick_first fallback to direct path service config #4143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f765e29
fix(gax-grpc): add pick_first fallback to direct path service config
westarle Mar 14, 2026
0d8e061
fix(gax-grpc): replace grpclb with pick_first in direct path service …
westarle Mar 14, 2026
4d5430e
test: fix loadBalancingConfig typo
westarle Mar 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions ...java/gax-grpc/src/main/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1422,7 +1422,7 @@ public ApiFunction<ManagedChannelBuilder, ManagedChannelBuilder> getChannelConfi
}

private static ImmutableMap<String, ?> getDefaultDirectPathServiceConfig() {
// When channel pooling is enabled, force the pick_first grpclb strategy.
// When channel pooling is enabled, force the pick_first strategy.
// This is necessary to avoid the multiplicative effect of creating channel pool with
// `poolSize` number of `ManagedChannel`s, each with a `subSetting` number of number of
// subchannels.
Expand All @@ -1431,13 +1431,8 @@ public ApiFunction<ManagedChannelBuilder, ManagedChannelBuilder> getChannelConfi
ImmutableMap<String, Object> pickFirstStrategy =
ImmutableMap.<String, Object>of("pick_first", ImmutableMap.of());

ImmutableMap<String, Object> childPolicy =
ImmutableMap.<String, Object>of("childPolicy", ImmutableList.of(pickFirstStrategy));

ImmutableMap<String, Object> grpcLbPolicy =
ImmutableMap.<String, Object>of("grpclb", childPolicy);

return ImmutableMap.<String, Object>of("loadBalancingConfig", ImmutableList.of(grpcLbPolicy));
return ImmutableMap.<String, Object>of(
"loadBalancingConfig", ImmutableList.of(pickFirstStrategy));
}

private static void validateEndpoint(String endpoint) {
Expand Down
14 changes: 5 additions & 9 deletions .../gax-grpc/src/test/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ void testToBuilder() {
builder -> {
throw new UnsupportedOperationException();
};
Map<String, ?> directPathServiceConfig = ImmutableMap.of("loadbalancingConfig", "grpclb");
Map<String, ?> directPathServiceConfig = ImmutableMap.of("loadBalancingConfig", "pick_first");
List<InstantiatingGrpcChannelProvider.HardBoundTokenTypes> hardBoundTokenTypes =
new ArrayList<>();
hardBoundTokenTypes.add(InstantiatingGrpcChannelProvider.HardBoundTokenTypes.ALTS);
Expand Down Expand Up @@ -549,11 +549,7 @@ void testWithDefaultDirectPathServiceConfig() {
List<Map<String, ?>> lbConfigs = getAsObjectList(defaultServiceConfig, "loadBalancingConfig");
assertThat(lbConfigs).hasSize(1);
Map<String, ?> lbConfig = lbConfigs.get(0);
Map<String, ?> grpclb = getAsObject(lbConfig, "grpclb");
List<Map<String, ?>> childPolicies = getAsObjectList(grpclb, "childPolicy");
assertThat(childPolicies).hasSize(1);
Map<String, ?> childPolicy = childPolicies.get(0);
assertThat(childPolicy.keySet()).containsExactly("pick_first");
assertThat(lbConfig.keySet()).containsExactly("pick_first");
}

@Nullable
Expand Down Expand Up @@ -599,10 +595,10 @@ void testWithCustomDirectPathServiceConfig() {
ImmutableMap<String, Object> childPolicy =
ImmutableMap.<String, Object>of(
"childPolicy", ImmutableList.of(pickFirstStrategy), "foo", "bar");
ImmutableMap<String, Object> grpcLbPolicy =
ImmutableMap.<String, Object>of("grpclb", childPolicy);
ImmutableMap<String, Object> customLbPolicy =
ImmutableMap.<String, Object>of("my_custom_lb", childPolicy);
Map<String, Object> passedServiceConfig = new HashMap<>();
passedServiceConfig.put("loadBalancingConfig", ImmutableList.of(grpcLbPolicy));
passedServiceConfig.put("loadBalancingConfig", ImmutableList.of(customLbPolicy));

InstantiatingGrpcChannelProvider provider =
InstantiatingGrpcChannelProvider.newBuilder()
Expand Down
Loading