Skip to content

Commit f765e29

Browse files
committed
fix(gax-grpc): add pick_first fallback to direct path service config
1 parent a1b7565 commit f765e29

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

gax-java/gax-grpc/src/main/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProvider.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1437,7 +1437,8 @@ public ApiFunction<ManagedChannelBuilder, ManagedChannelBuilder> getChannelConfi
14371437
ImmutableMap<String, Object> grpcLbPolicy =
14381438
ImmutableMap.<String, Object>of("grpclb", childPolicy);
14391439

1440-
return ImmutableMap.<String, Object>of("loadBalancingConfig", ImmutableList.of(grpcLbPolicy));
1440+
return ImmutableMap.<String, Object>of(
1441+
"loadBalancingConfig", ImmutableList.of(grpcLbPolicy, pickFirstStrategy));
14411442
}
14421443

14431444
private static void validateEndpoint(String endpoint) {

gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProviderTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -547,13 +547,14 @@ void testWithDefaultDirectPathServiceConfig() {
547547
ImmutableMap<String, ?> defaultServiceConfig = provider.directPathServiceConfig;
548548

549549
List<Map<String, ?>> lbConfigs = getAsObjectList(defaultServiceConfig, "loadBalancingConfig");
550-
assertThat(lbConfigs).hasSize(1);
550+
assertThat(lbConfigs).hasSize(2);
551551
Map<String, ?> lbConfig = lbConfigs.get(0);
552552
Map<String, ?> grpclb = getAsObject(lbConfig, "grpclb");
553553
List<Map<String, ?>> childPolicies = getAsObjectList(grpclb, "childPolicy");
554554
assertThat(childPolicies).hasSize(1);
555555
Map<String, ?> childPolicy = childPolicies.get(0);
556556
assertThat(childPolicy.keySet()).containsExactly("pick_first");
557+
assertThat(lbConfigs.get(1).keySet()).containsExactly("pick_first");
557558
}
558559

559560
@Nullable

0 commit comments

Comments
 (0)