fix

Author: KirillKurdyukov

src/Ydb.Sdk/src/Ado/Session/PoolingSessionSource.cs

@@ -87,45 +87,34 @@ private async ValueTask<IPoolingSession> RentAsync(CancellationToken cancellatio
 
         var finalToken = ctsGetSession.Token;
 
-        try
+        var session = await OpenNewSession(finalToken).ConfigureAwait(false);
+        if (session != null)
+            return session;
+
+        while (true)
         {
-            var session = await OpenNewSession(finalToken).ConfigureAwait(false);
-            if (session != null)
-                return session;
+            session = await _idleSessionReader.ReadAsync(finalToken).ConfigureAwait(false);
 
-            while (true)
+            if (CheckIdleSession(session))
             {
-                session = await _idleSessionReader.ReadAsync(finalToken).ConfigureAwait(false);
-
-                if (CheckIdleSession(session))
-                {
-                    return session;
-                }
+                return session;
+            }
 
-                // If we're here, our waiting attempt on the idle session channel was released with a null
-                // (or bad session), or we're in sync mode. Check again if a new idle session has appeared since we last checked.
-                if (TryGetIdleSession(out session))
-                {
-                    return session;
-                }
+            // If we're here, our waiting attempt on the idle session channel was released with a null
+            // (or bad session), or we're in sync mode. Check again if a new idle session has appeared since we last checked.
+            if (TryGetIdleSession(out session))
+            {
+                return session;
+            }
 
-                // We might have closed a session in the meantime and no longer be at max capacity
-                // so try to open a new session and if that fails, loop again.
-                session = await OpenNewSession(finalToken).ConfigureAwait(false);
-                if (session != null)
-                {
-                    return session;
-                }
+            // We might have closed a session in the meantime and no longer be at max capacity
+            // so try to open a new session and if that fails, loop again.
+            session = await OpenNewSession(finalToken).ConfigureAwait(false);
+            if (session != null)
+            {
+                return session;
             }
         }
-        catch (OperationCanceledException e)
-        {
-            throw new YdbException(StatusCode.Cancelled,
-                $"The connection pool has been exhausted, either raise 'MaxSessionPool' " +
-                $"(currently {_maxSessionSize}) or 'CreateSessionTimeout' " +
-                $"(currently {_createSessionTimeout} seconds) in your connection string.", e
-            );
-        }
     }
 
     private async ValueTask<IPoolingSession?> OpenNewSession(CancellationToken cancellationToken)

src/Ydb.Sdk/src/Ado/YdbConnection.cs

@@ -92,8 +92,18 @@ public override void ChangeDatabase(string databaseName)
     public override async Task OpenAsync(CancellationToken cancellationToken)
     {
         ThrowIfConnectionOpen();
-
-        Session = await PoolManager.GetSession(ConnectionStringBuilder, cancellationToken);
+        try
+        {
+            Session = await PoolManager.GetSession(ConnectionStringBuilder, cancellationToken);
+        }
+        catch (OperationCanceledException e)
+        {
+            throw new YdbException(StatusCode.Cancelled,
+                $"The connection pool has been exhausted, either raise 'MaxSessionPool' " +
+                $"(currently {ConnectionStringBuilder.MaxSessionPool}) or 'CreateSessionTimeout' " +
+                $"(currently {ConnectionStringBuilder.CreateSessionTimeout} seconds) in your connection string.", e
+            );
+        }
 
         OnStateChange(ClosedToOpenEventArgs);