Skip to content

Commit 500f767

Browse files
committed
Disable new PickFirstLB
1 parent 863d811 commit 500f767

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

core/src/main/java/io/grpc/internal/PickFirstLoadBalancerProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public final class PickFirstLoadBalancerProvider extends LoadBalancerProvider {
3838
private static final String SHUFFLE_ADDRESS_LIST_KEY = "shuffleAddressList";
3939

4040
static boolean enableNewPickFirst =
41-
GrpcUtil.getFlag("GRPC_EXPERIMENTAL_ENABLE_NEW_PICK_FIRST", true);
41+
GrpcUtil.getFlag("GRPC_EXPERIMENTAL_ENABLE_NEW_PICK_FIRST", false);
4242

4343
public static boolean isEnabledHappyEyeballs() {
4444
return GrpcUtil.getFlag(GRPC_EXPERIMENTAL_XDS_DUALSTACK_ENDPOINTS, false);

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,8 @@ public void skipFailingHosts_pickNextNonFailingHost() {
446446
assertThat(result.getStatus().isOk()).isTrue();
447447
assertThat(result.getSubchannel()).isNull(); // buffer request
448448
int expectedTimes = PickFirstLoadBalancerProvider.isEnabledHappyEyeballs() ? 1 : 2;
449-
verify(getSubChannel(servers.get(1)), times(expectedTimes)).requestConnection(); // kicked off connection to server2
449+
// verify kicked off connection to server2
450+
verify(getSubChannel(servers.get(1)), times(expectedTimes)).requestConnection();
450451
assertThat(subchannels.size()).isEqualTo(2); // no excessive connection
451452

452453
deliverSubchannelState(getSubChannel(servers.get(1)), CSI_CONNECTING);

0 commit comments

Comments
 (0)