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

Pick first load balancer: don't connect forever without calls

This commit is contained in:
murgatroid99 2019-08-29 10:36:09 -07:00
parent b4d848865d
commit ee4985886d
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
packages/grpc-js/src/load-balancer-pick-first.ts
View File

@ -122,19 +122,6 @@ export class PickFirstLoadBalancer implements LoadBalancer {
if (newState === ConnectivityState.CONNECTING) { if (newState === ConnectivityState.CONNECTING) {
this.subchannelConnectingCount += 1; this.subchannelConnectingCount += 1;
} }
if (newState === ConnectivityState.READY) {
this.pickSubchannel(subchannel);
return;
} else {
if (this.currentPick === null) {
if (
newState === ConnectivityState.TRANSIENT_FAILURE ||
newState === ConnectivityState.IDLE
) {
process.nextTick(() => {
subchannel.startConnecting();
});
}
/* If the subchannel we most recently attempted to start connecting /* If the subchannel we most recently attempted to start connecting
* to goes into TRANSIENT_FAILURE, immediately try to start * to goes into TRANSIENT_FAILURE, immediately try to start
* connecting to the next one instead of waiting for the connection * connecting to the next one instead of waiting for the connection
@ -145,6 +132,11 @@ export class PickFirstLoadBalancer implements LoadBalancer {
) { ) {
this.startNextSubchannelConnecting(); this.startNextSubchannelConnecting();
} }
if (newState === ConnectivityState.READY) {
this.pickSubchannel(subchannel);
return;
} else {
if (this.currentPick === null) {
if (this.triedAllSubchannels) { if (this.triedAllSubchannels) {
const newLBState = const newLBState =
this.subchannelConnectingCount > 0 this.subchannelConnectingCount > 0
@ -318,6 +310,9 @@ export class PickFirstLoadBalancer implements LoadBalancer {
} }
exitIdle() { exitIdle() {
for (const subchannel of this.subchannels) {
subchannel.startConnecting();
}
if (this.currentState === ConnectivityState.IDLE) { if (this.currentState === ConnectivityState.IDLE) {
if (this.latestAddressList.length > 0) { if (this.latestAddressList.length > 0) {
this.connectToAddressList(); this.connectToAddressList();