Merge pull request #2380 from murgatroid99/grpc-js_pick_first_fix2

grpc-js: Fix address equality check in pick-first
grpc · Mar 7, 2023 · 7aba000 · 7aba000
2 parents e66909d + 0726fdf
commit 7aba000
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/packages/grpc-js/package.json b/packages/grpc-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@grpc/grpc-js",
-  "version": "1.8.11",
+  "version": "1.8.12",
   "description": "gRPC Library for Node - pure JS implementation",
   "homepage": "https://grpc.io/",
   "repository": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js",

diff --git a/packages/grpc-js/src/load-balancer-pick-first.ts b/packages/grpc-js/src/load-balancer-pick-first.ts
@@ -420,8 +420,9 @@ export class PickFirstLoadBalancer implements LoadBalancer {
      * address list is different from the existing one */
     if (
       this.subchannels.length === 0 ||
+      this.latestAddressList.length !== addressList.length ||
       !this.latestAddressList.every(
-        (value, index) => subchannelAddressEqual(addressList[index], value)
+        (value, index) => addressList[index] && subchannelAddressEqual(addressList[index], value)
       )
     ) {
       this.latestAddressList = addressList;

diff --git a/packages/grpc-js/src/subchannel-address.ts b/packages/grpc-js/src/subchannel-address.ts
@@ -41,9 +41,15 @@ export function isTcpSubchannelAddress(
 }
 
 export function subchannelAddressEqual(
-  address1: SubchannelAddress,
-  address2: SubchannelAddress
+  address1?: SubchannelAddress,
+  address2?: SubchannelAddress
 ): boolean {
+  if (!address1 && !address2) {
+    return true;
+  }
+  if (!address1 || !address2) {
+    return false;
+  }
   if (isTcpSubchannelAddress(address1)) {
     return (
       isTcpSubchannelAddress(address2) &&