SNOW-902611 ClearAllPools removes entire SessionPools collection in n…

…ew pool
snowflakedb · Oct 31, 2023 · beca66b · beca66b
1 parent 4c73d76
commit beca66b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/Snowflake.Data.Tests/IntegrationTests/SFConnectionPoolIT.cs b/Snowflake.Data.Tests/IntegrationTests/SFConnectionPoolIT.cs
@@ -38,7 +38,7 @@ public SFConnectionPoolIT(ConnectionPoolType connectionPoolTypeUnderTest)
             SnowflakeDbConnectionPool.GetPool(ConnectionString); // to instantiate the pool used in tests
             SnowflakeDbConnectionPool.GetPool(ConnectionString + " retryCount=1"); 
             SnowflakeDbConnectionPool.GetPool(ConnectionString + " retryCount=2"); 
-            SnowflakeDbConnectionPool.SetPooling(true); // TODO: when no session pool created it doesn't do anything!!!!  maybe this state should be at pool management layer, not session pool layer
+            SnowflakeDbConnectionPool.SetPooling(true);
             SnowflakeDbConnectionPool.ClearAllPools();
             s_logger.Debug($"---------------- BeforeTest ---------------------");
             s_logger.Debug($"Testing Pool Type: {SnowflakeDbConnectionPool.GetConnectionPoolVersion()}");
@@ -183,9 +183,9 @@ public void TestConnectionPool()
         [Test]
         public void TestConnectionPoolIsFull()
         {
-            var pool = SnowflakeDbConnectionPool.GetPool(ConnectionString);
-            SnowflakeDbConnectionPool.SetPooling(true);
             SnowflakeDbConnectionPool.ClearAllPools();
+            SnowflakeDbConnectionPool.SetPooling(true);
+            var pool = SnowflakeDbConnectionPool.GetPool(ConnectionString);
             SnowflakeDbConnectionPool.SetMaxPoolSize(2);
             var conn1 = new SnowflakeDbConnection();
             conn1.ConnectionString = ConnectionString;
@@ -202,6 +202,8 @@ public void TestConnectionPoolIsFull()
             conn3.Open();
             Assert.AreEqual(ConnectionState.Open, conn3.State);
             SnowflakeDbConnectionPool.ClearAllPools();
+            pool = SnowflakeDbConnectionPool.GetPool(ConnectionString);
+            SnowflakeDbConnectionPool.SetMaxPoolSize(2);
 
             conn1.Close();
             Assert.AreEqual(1, pool.GetCurrentPoolSize());
@@ -370,10 +372,10 @@ public void TestNewConnectionPoolFull()
         {
             TestOnlyForNewPool();
 
-            var sessionPool = SnowflakeDbConnectionPool.GetPool(ConnectionString);
             SnowflakeDbConnectionPool.ClearAllPools();
-            SnowflakeDbConnectionPool.SetMaxPoolSize(2);
             SnowflakeDbConnectionPool.SetPooling(true);
+            var sessionPool = SnowflakeDbConnectionPool.GetPool(ConnectionString);
+            SnowflakeDbConnectionPool.SetMaxPoolSize(2);
 
             var conn1 = new SnowflakeDbConnection();
             conn1.ConnectionString = ConnectionString;
@@ -456,6 +458,7 @@ void ThreadProcess2(string connstr)
         public void TestConnectionPoolDisable()
         {
             SnowflakeDbConnectionPool.ClearAllPools();
+            SnowflakeDbConnectionPool.GetPool(ConnectionString);
             SnowflakeDbConnectionPool.SetPooling(false);
 
             var conn1 = new SnowflakeDbConnection();

diff --git a/Snowflake.Data/Core/Session/ConnectionPoolManager.cs b/Snowflake.Data/Core/Session/ConnectionPoolManager.cs
@@ -52,6 +52,7 @@ public void ClearAllPools()
             {
                 sessionPool.ClearAllPools();       
             }
+            _pools.Clear();
         }
 
         public void SetMaxPoolSize(int maxPoolSize)
-Original file line number
+Diff line change
@@ Expand Up / @@ -52,6 +52,7 @@ public void ClearAllPools() @@
                 {
                     sessionPool.ClearAllPools();
                 }
+                _pools.Clear();
             }
             public void SetMaxPoolSize(int maxPoolSize)
@@ Expand Down @@