From a61dfb1527d028c6cf14114fe29ff10b3fa20eb4 Mon Sep 17 00:00:00 2001 From: Michael Lumish Date: Thu, 28 May 2020 11:52:02 -0700 Subject: [PATCH] Some cleanup and fixes --- packages/grpc-js/src/load-balancer-priority.ts | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/grpc-js/src/load-balancer-priority.ts b/packages/grpc-js/src/load-balancer-priority.ts index 94a4ace7..d3070715 100644 --- a/packages/grpc-js/src/load-balancer-priority.ts +++ b/packages/grpc-js/src/load-balancer-priority.ts @@ -100,9 +100,6 @@ export class PriorityLoadBalancer implements LoadBalancer { }, }); this.picker = new QueuePicker(this.childBalancer); - - this.deactivationTimer = setTimeout(() => {}, 0); - clearTimeout(this.deactivationTimer); } private updateState(connectivityState: ConnectivityState, picker: Picker) { @@ -415,7 +412,7 @@ export class PriorityLoadBalancer implements LoadBalancer { this.priorities = priorityConfig.priorities; /* Pair up the new child configs with the corresponding address lists, and * update all existing children with their new configs */ - for (const [childName, childConfig] of priorityConfig.children.entries()) { + for (const [childName, childConfig] of priorityConfig.children) { const chosenChildConfig = getFirstUsableConfig(childConfig.config); if (chosenChildConfig !== null) { const childAddresses = childAddressMap.get(childName) ?? []; @@ -434,7 +431,7 @@ export class PriorityLoadBalancer implements LoadBalancer { } } // Deactivate all children that are no longer in the priority list - for (const [childName, child] of this.children.entries()) { + for (const [childName, child] of this.children) { if (this.priorities.indexOf(childName) < 0) { child.deactivate(); }