SNOW-1629635 fix connection pool allocation (#1024)

snowflakedb · Sep 23, 2024 · 77410c7 · 77410c7
1 parent aef4d3a
commit 77410c7
Show file tree

Hide file tree

Showing 13 changed files with 324 additions and 251 deletions.
diff --git a/Snowflake.Data.Tests/IntegrationTests/ConnectionMultiplePoolsAsyncIT.cs b/Snowflake.Data.Tests/IntegrationTests/ConnectionMultiplePoolsAsyncIT.cs
@@ -22,7 +22,7 @@ public class ConnectionMultiplePoolsAsyncIT: SFBaseTestAsync
         [SetUp]
         public new void BeforeTest()
         {
-            SnowflakeDbConnectionPool.SetConnectionPoolVersion(ConnectionPoolType.MultipleConnectionPool);
+            SnowflakeDbConnectionPool.ForceConnectionPoolVersion(ConnectionPoolType.MultipleConnectionPool);
             SnowflakeDbConnectionPool.ClearAllPools();
         }
 

diff --git a/Snowflake.Data.Tests/IntegrationTests/ConnectionMultiplePoolsIT.cs b/Snowflake.Data.Tests/IntegrationTests/ConnectionMultiplePoolsIT.cs
@@ -22,7 +22,7 @@ public class ConnectionMultiplePoolsIT: SFBaseTest
         [SetUp]
         public new void BeforeTest()
         {
-            SnowflakeDbConnectionPool.SetConnectionPoolVersion(ConnectionPoolType.MultipleConnectionPool);
+            SnowflakeDbConnectionPool.ForceConnectionPoolVersion(ConnectionPoolType.MultipleConnectionPool);
             SnowflakeDbConnectionPool.ClearAllPools();
         }
 

diff --git a/Snowflake.Data.Tests/IntegrationTests/ConnectionPoolChangedSessionIT.cs b/Snowflake.Data.Tests/IntegrationTests/ConnectionPoolChangedSessionIT.cs
@@ -48,7 +48,7 @@ public class ConnectionPoolChangedSessionIT : SFBaseTest
         public static void BeforeAllTests()
         {
             s_previousPoolConfigRestorer = new PoolConfig();
-            SnowflakeDbConnectionPool.SetConnectionPoolVersion(ConnectionPoolType.MultipleConnectionPool);
+            SnowflakeDbConnectionPool.ForceConnectionPoolVersion(ConnectionPoolType.MultipleConnectionPool);
         }
 
         [SetUp]

diff --git a/Snowflake.Data.Tests/IntegrationTests/ConnectionPoolCommonIT.cs b/Snowflake.Data.Tests/IntegrationTests/ConnectionPoolCommonIT.cs
@@ -32,7 +32,7 @@ public ConnectionPoolCommonIT(ConnectionPoolType connectionPoolTypeUnderTest)
         [SetUp]
         public new void BeforeTest()
         {
-            SnowflakeDbConnectionPool.SetConnectionPoolVersion(_connectionPoolTypeUnderTest);
+            SnowflakeDbConnectionPool.ForceConnectionPoolVersion(_connectionPoolTypeUnderTest);
             SnowflakeDbConnectionPool.ClearAllPools();
             if (_connectionPoolTypeUnderTest == ConnectionPoolType.SingleConnectionCache)
             {

diff --git a/Snowflake.Data.Tests/IntegrationTests/ConnectionSinglePoolCacheAsyncIT.cs b/Snowflake.Data.Tests/IntegrationTests/ConnectionSinglePoolCacheAsyncIT.cs
@@ -20,7 +20,7 @@ public class ConnectionSinglePoolCacheAsyncIT: SFBaseTestAsync
         [SetUp]
         public new void BeforeTest()
         {
-            SnowflakeDbConnectionPool.SetConnectionPoolVersion(ConnectionPoolType.SingleConnectionCache);
+            SnowflakeDbConnectionPool.ForceConnectionPoolVersion(ConnectionPoolType.SingleConnectionCache);
             SnowflakeDbConnectionPool.ClearAllPools();
         }
 

diff --git a/Snowflake.Data.Tests/IntegrationTests/ConnectionSinglePoolCacheIT.cs b/Snowflake.Data.Tests/IntegrationTests/ConnectionSinglePoolCacheIT.cs
@@ -21,7 +21,7 @@ public class ConnectionSinglePoolCacheIT: SFBaseTest
         [SetUp]
         public new void BeforeTest()
         {
-            SnowflakeDbConnectionPool.SetConnectionPoolVersion(ConnectionPoolType.SingleConnectionCache);
+            SnowflakeDbConnectionPool.ForceConnectionPoolVersion(ConnectionPoolType.SingleConnectionCache);
             SnowflakeDbConnectionPool.ClearAllPools();
             SnowflakeDbConnectionPool.SetPooling(true);
         }

diff --git a/Snowflake.Data.Tests/UnitTests/ConnectionCacheManagerTest.cs b/Snowflake.Data.Tests/UnitTests/ConnectionCacheManagerTest.cs
@@ -16,7 +16,7 @@ public class ConnectionCacheManagerTest
         public static void BeforeAllTests()
         {
             s_poolConfig = new PoolConfig();
-            SnowflakeDbConnectionPool.SetConnectionPoolVersion(ConnectionPoolType.SingleConnectionCache);
+            SnowflakeDbConnectionPool.ForceConnectionPoolVersion(ConnectionPoolType.SingleConnectionCache);
             SessionPool.SessionFactory = new MockSessionFactory();
         }
 

diff --git a/Snowflake.Data.Tests/UnitTests/ConnectionPoolManagerTest.cs b/Snowflake.Data.Tests/UnitTests/ConnectionPoolManagerTest.cs
@@ -30,7 +30,7 @@ class ConnectionPoolManagerTest
         public static void BeforeAllTests()
         {
             s_poolConfig = new PoolConfig();
-            SnowflakeDbConnectionPool.SetConnectionPoolVersion(ConnectionPoolType.MultipleConnectionPool);
+            SnowflakeDbConnectionPool.ForceConnectionPoolVersion(ConnectionPoolType.MultipleConnectionPool);
             SessionPool.SessionFactory = new MockSessionFactory();
         }
 

diff --git a/Snowflake.Data.Tests/Util/PoolConfig.cs b/Snowflake.Data.Tests/Util/PoolConfig.cs
@@ -25,7 +25,7 @@ public PoolConfig()
 
         public void Reset()
         {
-            SnowflakeDbConnectionPool.SetConnectionPoolVersion(_connectionPoolType);
+            SnowflakeDbConnectionPool.ForceConnectionPoolVersion(_connectionPoolType);
             if (_connectionPoolType == ConnectionPoolType.MultipleConnectionPool)
                 return; // for multiple connection pool setting parameters for all the pools doesn't work by design
             SnowflakeDbConnectionPool.SetMaxPoolSize(_maxPoolSize);

diff --git a/Snowflake.Data/Client/SnowflakeDbConnectionPool.cs b/Snowflake.Data/Client/SnowflakeDbConnectionPool.cs
@@ -8,6 +8,7 @@
 using System.Threading.Tasks;
 using Snowflake.Data.Core;
 using Snowflake.Data.Core.Session;
+using Snowflake.Data.Core.Tools;
 using Snowflake.Data.Log;
 
 namespace Snowflake.Data.Client
@@ -25,7 +26,7 @@ private static IConnectionManager ConnectionManager
             {
                 if (s_connectionManager != null)
                     return s_connectionManager;
-                SetConnectionPoolVersion(DefaultConnectionPoolType);
+                SetConnectionPoolVersion(DefaultConnectionPoolType, false);
                 return s_connectionManager;
             }
         }
@@ -122,13 +123,16 @@ public static bool GetPooling()
 
         public static void SetOldConnectionPoolVersion()
         {
-            SetConnectionPoolVersion(ConnectionPoolType.SingleConnectionCache);
+            ForceConnectionPoolVersion(ConnectionPoolType.SingleConnectionCache);
         }
 
-        internal static void SetConnectionPoolVersion(ConnectionPoolType requestedPoolType)
+        private static void SetConnectionPoolVersion(ConnectionPoolType requestedPoolType, bool force)
         {
             lock (s_connectionManagerInstanceLock)
             {
+                if (s_connectionManager != null && !force)
+                    return;
+                Diagnostics.LogDiagnostics();
                 s_connectionManager?.ClearAllPools();
                 if (requestedPoolType == ConnectionPoolType.MultipleConnectionPool)
                 {
@@ -143,6 +147,11 @@ internal static void SetConnectionPoolVersion(ConnectionPoolType requestedPoolTy
             }
         }
 
+        internal static void ForceConnectionPoolVersion(ConnectionPoolType requestedPoolType)
+        {
+            SetConnectionPoolVersion(requestedPoolType, true);
+        }
+
         internal static ConnectionPoolType GetConnectionPoolVersion()
         {
             if (ConnectionManager != null)