Skip to content

Commit 703971f

Browse files
authored
Merge pull request #2037 from murgatroid99/grpc-js_dns_backoff_ip_reset
grpc-js: Fix `exitIdle` propagation and DNS IP result backoff
2 parents 8d19d6a + f49ed62 commit 703971f

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

packages/grpc-js/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@grpc/grpc-js",
3-
"version": "1.5.3",
3+
"version": "1.5.4",
44
"description": "gRPC Library for Node - pure JS implementation",
55
"homepage": "https://grpc.io/",
66
"repository": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js",

packages/grpc-js/src/load-balancer-child-handler.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,9 @@ export class ChildLoadBalancerHandler implements LoadBalancer {
125125
}
126126
exitIdle(): void {
127127
if (this.currentChild) {
128-
this.currentChild.resetBackoff();
128+
this.currentChild.exitIdle();
129129
if (this.pendingChild) {
130-
this.pendingChild.resetBackoff();
130+
this.pendingChild.exitIdle();
131131
}
132132
}
133133
}

packages/grpc-js/src/resolver-dns.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ class DnsResolver implements Resolver {
144144
if (this.ipResult !== null) {
145145
trace('Returning IP address for target ' + uriToString(this.target));
146146
setImmediate(() => {
147+
this.backoff.reset();
147148
this.listener.onSuccessfulResolution(
148149
this.ipResult!,
149150
null,

0 commit comments

Comments
 (0)