Merge pull request #407 from ydb-platform/call-cancelled-bug3

fix Call cancelled error
ydb-platform · Sep 26, 2024 · 3129356 · 3129356
2 parents 2da21af + ee14b9f
commit 3129356
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/src/__tests__/e2e/query-service/query-service-client.ts b/src/__tests__/e2e/query-service/query-service-client.ts
@@ -9,7 +9,7 @@ import {QuerySession, IExecuteResult} from "../../../query";
 if (process.env.TEST_ENVIRONMENT === 'dev') require('dotenv').config();
 
 const DATABASE = '/local';
-const ENDPOINT = process.env.YDB_ENDPOINT || 'grpc://localhost:2135';
+const ENDPOINT = process.env.YDB_ENDPOINT || 'grpc://localhost:2136';
 
 describe('Query client', () => {
 

diff --git a/src/errors.ts b/src/errors.ts
@@ -46,6 +46,7 @@ export enum StatusCode {
 
     UNAUTHENTICATED = CLIENT_STATUSES_FIRST + 30, // SDK local
     SESSION_POOL_EMPTY = CLIENT_STATUSES_FIRST + 40, // SDK local
+    RETRIES_EXCEEDED = CLIENT_STATUSES_FIRST + 50, // SDK local
 }
 
 /**
@@ -314,15 +315,20 @@ export class ClientResourceExhausted extends TransportError {
     public readonly [RetryPolicySymbol] =  retryPolicy(Backoff.Slow, false, true, true);
 }
 
+export class ClientCancelled extends TransportError {
+    static status = StatusCode.CLIENT_CANCELED;
+    public readonly [RetryPolicySymbol] =  retryPolicy(Backoff.No, false, false, false);
+}
+
 const TRANSPORT_ERROR_CODES = new Map([
-    [GrpcStatus.CANCELLED, Cancelled],
+    [GrpcStatus.CANCELLED, ClientCancelled],
     [GrpcStatus.UNAVAILABLE, TransportUnavailable],
     [GrpcStatus.DEADLINE_EXCEEDED, ClientDeadlineExceeded],
     [GrpcStatus.RESOURCE_EXHAUSTED, ClientResourceExhausted]
 ]);
 
-export class ClientCancelled extends YdbError {
-    static status = StatusCode.CLIENT_CANCELED;
+export class RetriesExceeded extends YdbError {
+    static status = StatusCode.RETRIES_EXCEEDED;
     public readonly [RetryPolicySymbol] =  retryPolicy(Backoff.No, false, false, false);
 
     constructor(public readonly cause: Error) {

diff --git a/src/retries/retryStrategy.ts b/src/retries/retryStrategy.ts
@@ -1,4 +1,4 @@
-import {Backoff, ClientCancelled, SpecificErrorRetryPolicy} from "../errors";
+import {Backoff, RetriesExceeded, SpecificErrorRetryPolicy} from "../errors";
 import {HasLogger} from "../logger/has-logger";
 import {Logger} from "../logger/simple-logger";
 import {RetryParameters} from "./retryParameters";
@@ -45,7 +45,7 @@ export class RetryStrategy implements HasLogger {
                 while (true) {
                     if (maxRetries !== 0 && attemptsCounter >= maxRetries) { // to support the old logic for a while
                         this.logger.debug(tooManyAttempts, attemptsCounter);
-                        throw new ClientCancelled(new Error(`Too many attempts: ${attemptsCounter}`));
+                        throw new RetriesExceeded(new Error(`Too many attempts: ${attemptsCounter}`));
                     }
                     let r: RetryLambdaResult<T>;
                     try {

diff --git a/src/retries_obsoleted.ts b/src/retries_obsoleted.ts
@@ -2,7 +2,6 @@ import {YdbError, TransportError} from './errors';
 import * as errors from './errors';
 import * as utils from "./utils";
 import {Logger} from "./logger/simple-logger";
-// import {getDefaultLogger} from "./logger/get-default-logger";
 
 export class BackoffSettings {
     /**
@@ -56,6 +55,7 @@ const RETRYABLE_ERRORS_FAST = [
     errors.NotFound,
     errors.TransportUnavailable,
     errors.ClientDeadlineExceeded,
+    errors.ClientCancelled,
 ];
 const RETRYABLE_ERRORS_SLOW = [errors.Overloaded, errors.ClientResourceExhausted];