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

Fix state changes when handling resolution failures

This commit is contained in:
Michael Lumish 2020-05-04 15:06:51 -07:00
parent 90013c695d
commit 265b39b6de
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/grpc-js/src/resolving-load-balancer.ts
View File

@ -51,6 +51,8 @@ export class ResolvingLoadBalancer implements LoadBalancer {
private innerResolver: Resolver; private innerResolver: Resolver;
private childLoadBalancer: ChildLoadBalancerHandler; private childLoadBalancer: ChildLoadBalancerHandler;
private latestChildState: ConnectivityState = ConnectivityState.IDLE;
private latestChildPicker: Picker = new QueuePicker(this);
/** /**
* This resolving load balancer's current connectivity state. * This resolving load balancer's current connectivity state.
*/ */
@ -106,6 +108,8 @@ export class ResolvingLoadBalancer implements LoadBalancer {
} }
}, },
updateState: (newState: ConnectivityState, picker: Picker) => { updateState: (newState: ConnectivityState, picker: Picker) => {
this.latestChildState = newState;
this.latestChildPicker = picker;
this.updateState(newState, picker); this.updateState(newState, picker);
} }
}); });
@ -177,6 +181,8 @@ export class ResolvingLoadBalancer implements LoadBalancer {
if (this.continueResolving) { if (this.continueResolving) {
this.updateResolution(); this.updateResolution();
this.continueResolving = false; this.continueResolving = false;
} else {
this.updateState(this.latestChildState, this.latestChildPicker)
} }
}); });
} }
@ -205,7 +211,7 @@ export class ResolvingLoadBalancer implements LoadBalancer {
} }
private handleResolutionFailure(error: StatusObject) { private handleResolutionFailure(error: StatusObject) {
if (this.currentState === ConnectivityState.IDLE) { if (this.latestChildState === ConnectivityState.IDLE) {
this.updateState( this.updateState(
ConnectivityState.TRANSIENT_FAILURE, ConnectivityState.TRANSIENT_FAILURE,
new UnavailablePicker(error) new UnavailablePicker(error)