grpc
/
grpc-node
mirror of https://github.com/grpc/grpc-node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some cleanup and fixes

This commit is contained in:
Michael Lumish 2020-05-28 11:52:02 -07:00
parent bfc406dd7c
commit a61dfb1527
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/grpc-js/src/load-balancer-priority.ts
View File

@ -100,9 +100,6 @@ export class PriorityLoadBalancer implements LoadBalancer {
}, },
}); });
this.picker = new QueuePicker(this.childBalancer); this.picker = new QueuePicker(this.childBalancer);
this.deactivationTimer = setTimeout(() => {}, 0);
clearTimeout(this.deactivationTimer);
} }
private updateState(connectivityState: ConnectivityState, picker: Picker) { private updateState(connectivityState: ConnectivityState, picker: Picker) {
@ -415,7 +412,7 @@ export class PriorityLoadBalancer implements LoadBalancer {
this.priorities = priorityConfig.priorities; this.priorities = priorityConfig.priorities;
/* Pair up the new child configs with the corresponding address lists, and /* Pair up the new child configs with the corresponding address lists, and
* update all existing children with their new configs */ * 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); const chosenChildConfig = getFirstUsableConfig(childConfig.config);
if (chosenChildConfig !== null) { if (chosenChildConfig !== null) {
const childAddresses = childAddressMap.get(childName) ?? []; 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 // 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) { if (this.priorities.indexOf(childName) < 0) {
child.deactivate(); child.deactivate();
} }