Fixed bug: Grpc.Core.StatusCode.Cancelled was mapped to server's Canceled status. (ydb-platform#478)

Author: KirillKurdyukov

src/Ydb.Sdk/CHANGELOG.md

@@ -1,3 +1,4 @@
+- Fixed bug: Grpc.Core.StatusCode.Cancelled was mapped to server's Canceled status.
 - ADO.NET: PoolingSessionSource 2.0 based on Npgsql pooling algorithm.
 - Added new ADO.NET options:
   - `MinSessionPool`: The minimum connection pool size.

src/Ydb.Sdk/src/Ado/Internal/StatusCodeUtils.cs

@@ -7,10 +7,9 @@ public static class StatusCodeUtils
     internal static StatusCode Code(this Grpc.Core.Status rpcStatus) => rpcStatus.StatusCode switch
     {
         Grpc.Core.StatusCode.Unavailable => StatusCode.ClientTransportUnavailable,
-        Grpc.Core.StatusCode.DeadlineExceeded => StatusCode.ClientTransportTimeout,
+        Grpc.Core.StatusCode.DeadlineExceeded or Grpc.Core.StatusCode.Cancelled => StatusCode.ClientTransportTimeout,
         Grpc.Core.StatusCode.ResourceExhausted => StatusCode.ClientTransportResourceExhausted,
         Grpc.Core.StatusCode.Unimplemented => StatusCode.ClientTransportUnimplemented,
-        Grpc.Core.StatusCode.Cancelled => StatusCode.Cancelled,
         _ => StatusCode.ClientTransportUnknown
     };
 

src/Ydb.Sdk/src/Pool/SessionPool.cs

@@ -225,12 +225,10 @@ internal void OnNotSuccessStatusCode(StatusCode code)
     {
         // ReSharper disable once InvertIf
         if (code is
-            StatusCode.Cancelled or
             StatusCode.BadSession or
             StatusCode.SessionBusy or
-            StatusCode.InternalError or
+            StatusCode.SessionExpired or
             StatusCode.ClientTransportTimeout or
-            StatusCode.Unavailable or
             StatusCode.ClientTransportUnavailable)
         {
             _logger.LogWarning("Session[{SessionId}] is deactivated. Reason StatusCode: {Code}", SessionId, code);

src/Ydb.Sdk/test/Ydb.Sdk.Ado.Specification.Tests/YdbCommandTests.cs

@@ -60,7 +60,7 @@ public override async Task ExecuteReaderAsync_is_canceled()
         await using var command = connection.CreateCommand();
         command.CommandText = "SELECT 1;";
         var task = command.ExecuteReaderAsync(CanceledToken);
-        Assert.Equal(StatusCode.Cancelled,
+        Assert.Equal(StatusCode.ClientTransportTimeout,
             (await Assert.ThrowsAnyAsync<YdbException>(() => task)).Code);
     }
 
@@ -70,7 +70,7 @@ public override async Task ExecuteNonQueryAsync_is_canceled()
         await using var command = connection.CreateCommand();
         command.CommandText = "SELECT 1;";
         var task = command.ExecuteNonQueryAsync(CanceledToken);
-        Assert.Equal(StatusCode.Cancelled,
+        Assert.Equal(StatusCode.ClientTransportTimeout,
             (await Assert.ThrowsAnyAsync<YdbException>(() => task)).Code);
     }
 
@@ -80,7 +80,7 @@ public override async Task ExecuteScalarAsync_is_canceled()
         await using var command = connection.CreateCommand();
         command.CommandText = "SELECT 1;";
         var task = command.ExecuteScalarAsync(CanceledToken);
-        Assert.Equal(StatusCode.Cancelled,
+        Assert.Equal(StatusCode.ClientTransportTimeout,
             (await Assert.ThrowsAnyAsync<YdbException>(() => task)).Code);
     }
 }

src/Ydb.Sdk/test/Ydb.Sdk.Ado.Tests/Internal/StatusCodeTestUtils.cs

@@ -11,7 +11,7 @@ public class StatusCodeTestUtils
     [InlineData(Grpc.Core.StatusCode.DeadlineExceeded, StatusCode.ClientTransportTimeout)]
     [InlineData(Grpc.Core.StatusCode.ResourceExhausted, StatusCode.ClientTransportResourceExhausted)]
     [InlineData(Grpc.Core.StatusCode.Unimplemented, StatusCode.ClientTransportUnimplemented)]
-    [InlineData(Grpc.Core.StatusCode.Cancelled, StatusCode.Cancelled)]
+    [InlineData(Grpc.Core.StatusCode.Cancelled, StatusCode.ClientTransportTimeout)]
     public void Code_GrpcCoreStatusCodeConvertToStatusCode_Assert(
         Grpc.Core.StatusCode statusCode,
         StatusCode expectedStatusCode

src/Ydb.Sdk/test/Ydb.Sdk.Ado.Tests/YdbConnectionTests.cs

@@ -238,7 +238,7 @@ public async Task YdbDataReader_WhenCancelTokenIsCanceled_ThrowYdbException()
         Assert.False(ydbDataReader.IsClosed);
         Assert.Equal(1, ydbDataReader.GetValue(0));
         Assert.Equal(ConnectionState.Open, connection.State);
-        Assert.Equal(StatusCode.Cancelled,
+        Assert.Equal(StatusCode.ClientTransportTimeout,
             (await Assert.ThrowsAsync<YdbException>(async () => await ydbDataReader.NextResultAsync(cts.Token))).Code);
         Assert.True(ydbDataReader.IsClosed);
         Assert.Equal(ConnectionState.Broken, connection.State);
@@ -254,7 +254,7 @@ public async Task YdbDataReader_WhenCancelTokenIsCanceled_ThrowYdbException()
         Assert.Equal(1, ydbDataReader.GetValue(0));
         Assert.False(ydbDataReader.IsClosed);
 
-        Assert.Equal(StatusCode.Cancelled,
+        Assert.Equal(StatusCode.ClientTransportTimeout,
             (await Assert.ThrowsAsync<YdbException>(async () => await ydbDataReader.NextResultAsync(cts.Token))).Code);
         Assert.True(ydbDataReader.IsClosed);
         Assert.Equal(ConnectionState.Broken, connection.State);
@@ -268,17 +268,17 @@ public async Task ExecuteMethods_WhenCancelTokenIsCanceled_ConnectionIsBroken()
         using var cts = new CancellationTokenSource();
         cts.Cancel();
 
-        Assert.Equal(StatusCode.Cancelled,
+        Assert.Equal(StatusCode.ClientTransportTimeout,
             (await Assert.ThrowsAsync<YdbException>(async () => await command.ExecuteReaderAsync(cts.Token))).Code);
         Assert.Equal(ConnectionState.Broken, connection.State);
         // ReSharper disable once MethodSupportsCancellation
         await connection.OpenAsync();
-        Assert.Equal(StatusCode.Cancelled,
+        Assert.Equal(StatusCode.ClientTransportTimeout,
             (await Assert.ThrowsAsync<YdbException>(async () => await command.ExecuteScalarAsync(cts.Token))).Code);
         Assert.Equal(ConnectionState.Broken, connection.State);
         // ReSharper disable once MethodSupportsCancellation
         await connection.OpenAsync();
-        Assert.Equal(StatusCode.Cancelled,
+        Assert.Equal(StatusCode.ClientTransportTimeout,
             (await Assert.ThrowsAsync<YdbException>(async () => await command.ExecuteNonQueryAsync(cts.Token))).Code);
         Assert.Equal(ConnectionState.Broken, connection.State);
     }