fix

Author: KirillKurdyukov

src/Ydb.Sdk/src/Ado/PoolManager.cs

@@ -50,19 +50,19 @@ CancellationToken cancellationToken
 
     internal static async Task ClearPool(string connectionString)
     {
-        if (Pools.Remove(connectionString, out var sessionPool))
+        try
         {
-            try
-            {
-                await SemaphoreSlim.WaitAsync();
+            await SemaphoreSlim.WaitAsync();
 
-                await sessionPool.DisposeAsync();
-            }
-            finally
+            if (Pools.Remove(connectionString, out var sessionPool))
             {
-                SemaphoreSlim.Release();
+                await sessionPool.DisposeAsync();
             }
         }
+        finally
+        {
+            SemaphoreSlim.Release();
+        }
     }
 
     internal static async Task ClearAllPools()

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

@@ -1,20 +1,12 @@
 using System.Collections.Immutable;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Ydb.Sdk.Ado.Tests;
 
 [Collection("PoolManagerTests")]
 [CollectionDefinition("PoolManagerTests", DisableParallelization = true)]
 public class PoolManagerTests
 {
-    private readonly ITestOutputHelper _testOutputHelper;
-
-    public PoolManagerTests(ITestOutputHelper testOutputHelper)
-    {
-        _testOutputHelper = testOutputHelper;
-    }
-
     [Theory]
     [InlineData(new[]
     {
@@ -36,6 +28,8 @@ public PoolManagerTests(ITestOutputHelper testOutputHelper)
     public async Task PoolManager_CachingAndCleanup(string[] connectionStrings, int expectedDrivers, int expectedPools)
     {
         await YdbConnection.ClearAllPools();
+        foreach (var (_, driver) in PoolManager.Drivers)
+            Assert.True(driver.IsDisposed);
         PoolManager.Drivers.Clear();
 
         var connections = connectionStrings
@@ -53,27 +47,24 @@ public async Task PoolManager_CachingAndCleanup(string[] connectionStrings, int
         await Task.WhenAll(parallelTasks);
 
         foreach (var (_, driver) in PoolManager.Drivers)
-        {
             Assert.False(driver.IsDisposed);
-        }
 
         Assert.Equal(expectedDrivers, PoolManager.Drivers.Count);
         Assert.Equal(expectedPools, PoolManager.Pools.Count);
 
         await ClearAllConnections(connections);
     }
 
-    private async Task ClearAllConnections(IReadOnlyCollection<YdbConnection> connections)
+    private static async Task ClearAllConnections(IReadOnlyCollection<YdbConnection> connections)
     {
         foreach (var connection in connections)
             await connection.CloseAsync();
 
         await YdbConnection.ClearAllPools();
         Assert.Empty(PoolManager.Pools);
 
-        foreach (var (str, driver) in PoolManager.Drivers)
+        foreach (var (_, driver) in PoolManager.Drivers)
         {
-            _testOutputHelper.WriteLine(str);
             Assert.True(driver.IsDisposed);
         }
     }