grpc-js: Delegate to child picker in ResolvingLoadBalancer#updateResolution

murgatroid99 · murgatroid99 · commit 5be024f060a7 · 2023-09-18T17:32:29.000-07:00
diff --git a/packages/grpc-js/src/resolving-load-balancer.ts b/packages/grpc-js/src/resolving-load-balancer.ts
@@ -264,7 +264,11 @@ export class ResolvingLoadBalancer implements LoadBalancer {
   private updateResolution() {
     this.innerResolver.updateResolution();
     if (this.currentState === ConnectivityState.IDLE) {
-      this.updateState(ConnectivityState.CONNECTING, new QueuePicker(this));
+      /* this.latestChildPicker is initialized as new QueuePicker(this), which
+       * is an appropriate value here if the child LB policy is unset.
+       * Otherwise, we want to delegate to the child here, in case that
+       * triggers something. */
+      this.updateState(ConnectivityState.CONNECTING, this.latestChildPicker);
     }
     this.backoffTimeout.runOnce();
   }

Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,11 @@ export class ResolvingLoadBalancer implements LoadBalancer {`
`264`	`264`	`private updateResolution() {`
`265`	`265`	`this.innerResolver.updateResolution();`
`266`	`266`	`if (this.currentState === ConnectivityState.IDLE) {`
`267`		`- this.updateState(ConnectivityState.CONNECTING, new QueuePicker(this));`
	`267`	`+ /* this.latestChildPicker is initialized as new QueuePicker(this), which`
	`268`	`+ * is an appropriate value here if the child LB policy is unset.`
	`269`	`+ * Otherwise, we want to delegate to the child here, in case that`
	`270`	`+ * triggers something. */`
	`271`	`+ this.updateState(ConnectivityState.CONNECTING, this.latestChildPicker);`
`268`	`272`	`}`
`269`	`273`	`this.backoffTimeout.runOnce();`
`270`	`274`	`}`