archive-gh-me/grpc-node
1
0
Fork 0
mirror of https://github.com/grpc/grpc-node.git synced 2025-12-08 18:23:54 +00:00
Code Issues Projects Releases Wiki Activity

grpc-js: Always use RetryingCall, always call onCommitted

Browse Source
This commit is contained in:
Michael Lumish 2025-01-14 18:09:58 -08:00
parent 5a942ed648
commit a5b6178d99
4 changed files with 22 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
packages/grpc-js/src/internal-channel.ts
View File

@ -705,33 +705,6 @@ export class InternalChannel {
);
}
createInnerCall(
callConfig: CallConfig,
method: string,
host: string,
credentials: CallCredentials,
deadline: Deadline
): LoadBalancingCall | RetryingCall {
// Create a RetryingCall if retries are enabled
if (this.options['grpc.enable_retries'] === 0) {
return this.createLoadBalancingCall(
callConfig,
method,
host,
credentials,
deadline
);
} else {
return this.createRetryingCall(
callConfig,
method,
host,
credentials,
deadline
);
}
}
createResolvingCall(
method: string,
deadline: Deadline,

1
packages/grpc-js/src/load-balancing-call.ts
View File

@ -254,7 +254,6 @@ export class LoadBalancingCall implements Call, DeadlineInfoProvider {
);
return;
}
this.callConfig.onCommitted?.();
pickResult.onCallStarted?.();
this.onCallEnded = pickResult.onCallEnded;
this.trace(

2
packages/grpc-js/src/resolving-call.ts
View File

@ -245,7 +245,7 @@ export class ResolvingCall implements Call {
this.filterStack = this.filterStackFactory.createFilter();
this.filterStack.sendMetadata(Promise.resolve(this.metadata)).then(
filteredMetadata => {
this.child = this.channel.createInnerCall(
this.child = this.channel.createRetryingCall(
config,
this.method,
this.host,

27
packages/grpc-js/src/retrying-call.ts
View File

@ -133,8 +133,9 @@ interface UnderlyingCall {
* transparent retry attempts may still be sent
* COMMITTED: One attempt is committed, and no new attempts will be
* sent
* NO_RETRY: Retries are disabled. Exists to track the transition to COMMITTED
*/
type RetryingCallState = 'RETRY' | 'HEDGING' | 'TRANSPARENT_ONLY' | 'COMMITTED';
type RetryingCallState = 'RETRY' | 'HEDGING' | 'TRANSPARENT_ONLY' | 'COMMITTED' | 'NO_RETRY';
/**
* The different types of objects that can be stored in the write buffer, with
@ -229,6 +230,9 @@ export class RetryingCall implements Call, DeadlineInfoProvider {
} else if (callConfig.methodConfig.hedgingPolicy) {
this.state = 'HEDGING';
this.maxAttempts = Math.min(callConfig.methodConfig.hedgingPolicy.maxAttempts, maxAttemptsLimit);
} else if (channel.getOptions()['grpc.enable_retries'] === 0) {
this.state = 'NO_RETRY';
this.maxAttempts = 1;
} else {
this.state = 'TRANSPARENT_ONLY';
this.maxAttempts = 1;
@ -318,8 +322,15 @@ export class RetryingCall implements Call, DeadlineInfoProvider {
if (this.state !== 'COMMITTED') {
return;
}
const earliestNeededMessageIndex =
this.underlyingCalls[this.committedCallIndex!].nextMessageToSend;
let earliestNeededMessageIndex: number;
if (this.underlyingCalls[this.committedCallIndex!].state === 'COMPLETED') {
/* If the committed call is completed, clear all messages, even if some
* have not been sent. */
earliestNeededMessageIndex = this.getNextBufferIndex();
} else {
earliestNeededMessageIndex =
this.underlyingCalls[this.committedCallIndex!].nextMessageToSend;
}
for (
let messageIndex = this.writeBufferOffset;
messageIndex < earliestNeededMessageIndex;
@ -343,9 +354,6 @@ export class RetryingCall implements Call, DeadlineInfoProvider {
if (this.state === 'COMMITTED') {
return;
}
if (this.underlyingCalls[index].state === 'COMPLETED') {
return;
}
this.trace(
'Committing call [' +
this.underlyingCalls[index].call.getCallNumber() +
@ -353,6 +361,7 @@ export class RetryingCall implements Call, DeadlineInfoProvider {
index
);
this.state = 'COMMITTED';
this.callConfig.onCommitted?.();
this.committedCallIndex = index;
for (let i = 0; i < this.underlyingCalls.length; i++) {
if (i === index) {
@ -471,6 +480,7 @@ export class RetryingCall implements Call, DeadlineInfoProvider {
) {
switch (this.state) {
case 'COMMITTED':
case 'NO_RETRY':
case 'TRANSPARENT_ONLY':
this.commitCall(callIndex);
this.reportStatus(status);
@ -566,6 +576,11 @@ export class RetryingCall implements Call, DeadlineInfoProvider {
this.reportStatus(status);
return;
}
if (this.state === 'NO_RETRY') {
this.commitCall(callIndex);
this.reportStatus(status);
return;
}
if (this.state === 'COMMITTED') {
this.reportStatus(status);
return;