fix

Author: KirillKurdyukov

src/Ydb.Sdk/src/Ado/YdbDataSource.cs

@@ -214,15 +214,16 @@ public Task<TResult> ExecuteAsync<TResult>(
         return await func(ydbConnection, ct);
     }, cancellationToken);
 
-    public Task ExecuteInTransactionAsync(Func<YdbConnection, Task> func,
-        TransactionMode transactionMode = TransactionMode.SerializableRw) =>
-        _retryPolicyExecutor.ExecuteAsync(async cancellationToken =>
-        {
-            await using var ydbConnection = await OpenConnectionAsync(cancellationToken);
-            await using var transaction = ydbConnection.BeginTransaction(transactionMode);
-            await func(ydbConnection);
-            await transaction.CommitAsync(cancellationToken);
-        });
+    public Task ExecuteInTransactionAsync(
+        Func<YdbConnection, Task> func,
+        TransactionMode transactionMode = TransactionMode.SerializableRw
+    ) => _retryPolicyExecutor.ExecuteAsync(async cancellationToken =>
+    {
+        await using var ydbConnection = await OpenConnectionAsync(cancellationToken);
+        await using var transaction = ydbConnection.BeginTransaction(transactionMode);
+        await func(ydbConnection);
+        await transaction.CommitAsync(cancellationToken);
+    });
 
     public Task<TResult> ExecuteInTransactionAsync<TResult>(
         Func<YdbConnection, Task<TResult>> func,

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

@@ -1,6 +1,5 @@
 using Xunit;
 using Ydb.Sdk.Ado.RetryPolicy;
-using Ydb.Sdk.Ado.Tests.Session;
 
 namespace Ydb.Sdk.Ado.Tests;
 
@@ -92,7 +91,7 @@ await _dataSource.ExecuteAsync(_ =>
             }
 
             return Task.CompletedTask;
-        });
+        }, new YdbRetryPolicyConfig { EnableRetryIdempotence = true });
     }
 
     [Theory]
@@ -180,4 +179,26 @@ await _dataSource.ExecuteAsync(ydbConnection =>
         Assert.Equal(3, ydbConnections.Count);
         Assert.True(ydbConnections.Distinct().Count() == ydbConnections.Count); // new one every time
     }
+
+    [Fact]
+    public async Task ExecuteAsync_CancelsBetweenRetries()
+    {
+        using var cts = new CancellationTokenSource();
+        var attempt = 0;
+
+        await Assert.ThrowsAnyAsync<OperationCanceledException>(async () =>
+        {
+            await _dataSource.ExecuteAsync(async (_, _) =>
+            {
+                attempt++;
+                if (attempt == 1)
+                {
+                    await cts.CancelAsync();
+                    throw new YdbException(StatusCode.BadSession, "Bad");
+                }
+            }, cts.Token);
+        });
+
+        Assert.Equal(1, attempt);
+    }
 }