Merge pull request #2564 from murgatroid99/grpc-js_ping_first_equality_check_backport

murgatroid99 · web-flow · commit e7e199c50175 · 2023-08-31T10:26:24.000-07:00
grpc-js: Fix pick-first-load-balancer pick subchannel lost state listener (1.9.x)
diff --git a/packages/grpc-js/package.json b/packages/grpc-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@grpc/grpc-js",
-  "version": "1.9.1",
+  "version": "1.9.2",
   "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
@@ -315,7 +315,7 @@ export class PickFirstLoadBalancer implements LoadBalancer {
   }
 
   private pickSubchannel(subchannel: SubchannelInterface) {
-    if (subchannel === this.currentPick) {
+    if (this.currentPick && subchannel.realSubchannelEquals(this.currentPick)) {
       return;
     }
     trace('Pick subchannel with address ' + subchannel.getAddress());

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@grpc/grpc-js",`
`3`		`- "version": "1.9.1",`
	`3`	`+ "version": "1.9.2",`
`4`	`4`	`"description": "gRPC Library for Node - pure JS implementation",`
`5`	`5`	`"homepage": "https://grpc.io/",`
`6`	`6`	`"repository": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js",`
Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,7 @@ export class PickFirstLoadBalancer implements LoadBalancer {`
`315`	`315`	`}`
`316`	`316`
`317`	`317`	`private pickSubchannel(subchannel: SubchannelInterface) {`
`318`		`- if (subchannel === this.currentPick) {`
	`318`	`+ if (this.currentPick && subchannel.realSubchannelEquals(this.currentPick)) {`
`319`	`319`	`return;`
`320`	`320`	`}`
`321`	`321`	`trace('Pick subchannel with address ' + subchannel.getAddress());`