From a5fac6f0565e147cdc1cb3376e9509ef4d503e2e Mon Sep 17 00:00:00 2001
From: Michael Lumish <mlumish@google.com>
Date: Mon, 8 Jul 2024 15:08:30 -0700
Subject: [PATCH] grpc-js: pick-first: Fix short circuit READY subchannel
 handling

---
 packages/grpc-js/src/load-balancer-pick-first.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/grpc-js/src/load-balancer-pick-first.ts b/packages/grpc-js/src/load-balancer-pick-first.ts
index e0885333..e042e116 100644
--- a/packages/grpc-js/src/load-balancer-pick-first.ts
+++ b/packages/grpc-js/src/load-balancer-pick-first.ts
@@ -485,6 +485,8 @@ export class PickFirstLoadBalancer implements LoadBalancer {
     trace('connectToAddressList([' + addressList.map(address => subchannelAddressToString(address)) + '])');
     for (const { subchannel } of newChildrenList) {
       if (subchannel.getConnectivityState() === ConnectivityState.READY) {
+        this.channelControlHelper.addChannelzChild(subchannel.getChannelzRef());
+        subchannel.addConnectivityStateListener(this.subchannelStateListener);
         this.pickSubchannel(subchannel);
         return;
       }
@@ -500,10 +502,6 @@ export class PickFirstLoadBalancer implements LoadBalancer {
     this.children = newChildrenList;
     for (const { subchannel } of this.children) {
       subchannel.addConnectivityStateListener(this.subchannelStateListener);
-      if (subchannel.getConnectivityState() === ConnectivityState.READY) {
-        this.pickSubchannel(subchannel);
-        return;
-      }
     }
     for (const child of this.children) {
       if (