SNOW-902611 move control over creation of session to session pool

Snowflake.Data.Tests/App.config

@@ -21,7 +21,7 @@ Copyright (c) 2012-2017 Snowflake Computing Inc. All rights reserved.
       </layout>
       <appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
         <layout type="log4net.Layout.PatternLayout">
-          <conversionPattern value="%date [%thread] [%-5level] [%ClassName:%line] - %message%newline" />
+          <conversionPattern value="%date [%thread] [%-5level] [%classname:%line] - %message%newline" />
         </layout>
       </appender>
     </appender>
@@ -31,7 +31,7 @@ Copyright (c) 2012-2017 Snowflake Computing Inc. All rights reserved.
       <appender-ref ref="RollingFileAppender" />
     </root>    
     <root>
-      <level value="WARN" />
+      <level value="ALL" />
       <appender-ref ref="ConsoleAppender" />
     </root>
   </log4net>

Snowflake.Data.Tests/IntegrationTests/PoolConfigRestorer.cs

@@ -0,0 +1,26 @@
+using Snowflake.Data.Client;
+
+namespace Snowflake.Data.Tests.IntegrationTests
+{
+    class PoolConfigRestorer {
+        private readonly bool _pooling;
+        private readonly long _timeout;
+        private readonly int _maxPoolSize;
+
+        public PoolConfigRestorer()
+        {
+            _maxPoolSize = SnowflakeDbConnectionPool.GetMaxPoolSize();
+            _timeout = SnowflakeDbConnectionPool.GetTimeout();
+            _pooling = SnowflakeDbConnectionPool.GetPooling();
+        }
+
+        public void Reset()
+        {
+            SnowflakeDbConnectionPool.SetMaxPoolSize(_maxPoolSize);
+            SnowflakeDbConnectionPool.SetTimeout(_timeout);
+            SnowflakeDbConnectionPool.SetPooling(_pooling);
+        }
+    }
+
+
+}

Snowflake.Data.Tests/IntegrationTests/SFConnectionIT.cs

@@ -18,11 +18,24 @@
     using Snowflake.Data.Tests.Mock;
     using System.Runtime.InteropServices;
 
-    [TestFixture]
+    [TestFixture, NonParallelizable]
     class SFConnectionIT : SFBaseTest
     {
         private static readonly SFLogger s_logger = SFLoggerFactory.GetLogger<SFConnectionIT>();
+        private static readonly PoolConfigRestorer s_previousPoolConfig = new PoolConfigRestorer();
+
+        [SetUp]
+        public void BeforeTest()
+        {
+            s_previousPoolConfig.Reset();
+            SnowflakeDbConnectionPool.ClearAllPools();
+        }
 
+        [TearDown]
+        public void AfterTest()
+        {
+            s_previousPoolConfig.Reset();
+        }
         [Test]
         public void TestBasicConnection()
         {
@@ -1889,9 +1902,9 @@
         [Test, NonParallelizable]
         public void TestCloseAsyncFailure()
         {
+            SnowflakeDbConnectionPool.SetPooling(false);
             using (var conn = new MockSnowflakeDbConnection(new MockCloseSessionException()))
             {
-                SnowflakeDbConnectionPool.SetPooling(false);
                 conn.ConnectionString = ConnectionString;
                 Assert.AreEqual(conn.State, ConnectionState.Closed);
                 Task task = null;

Snowflake.Data.Tests/IntegrationTests/SFConnectionPoolT.cs

@@ -15,45 +15,24 @@
     using Snowflake.Data.Tests.Mock;
     using System.Data.Common;
     using Moq;
-
-    class PoolConfig {
-        private readonly bool _pooling;
-        private readonly long _timeout;
-        private readonly int _maxPoolSize;
 
-        public PoolConfig()
-        {
-            _maxPoolSize = SnowflakeDbConnectionPool.GetMaxPoolSize();
-            _timeout = SnowflakeDbConnectionPool.GetTimeout();
-            _pooling = SnowflakeDbConnectionPool.GetPooling();
-        }
-
-        public void Reset()
-        {
-            SnowflakeDbConnectionPool.SetMaxPoolSize(_maxPoolSize);
-            SnowflakeDbConnectionPool.SetTimeout(_timeout);
-            SnowflakeDbConnectionPool.SetPooling(_pooling);
-        }
-    }
-
     [TestFixture, NonParallelizable]
     class SFConnectionPoolT : SFBaseTest
     {
-        private static SFLogger logger = SFLoggerFactory.GetLogger<SFConnectionPoolT>();
-        private static readonly PoolConfig previousPoolConfig = new PoolConfig();
+        private static readonly PoolConfigRestorer s_previousPoolConfig = new PoolConfigRestorer();
 
         [SetUp]
         public void BeforeTest()
         {
-            previousPoolConfig.Reset();
+            s_previousPoolConfig.Reset();
             SnowflakeDbConnectionPool.SetPooling(true);
             SnowflakeDbConnectionPool.ClearAllPools();
         }
 
         [TearDown]
         public void AfterTest()
         {
-            previousPoolConfig.Reset();
+            s_previousPoolConfig.Reset();
         }
 
         [OneTimeTearDown]
@@ -435,20 +414,20 @@
     class SFConnectionPoolITAsync : SFBaseTestAsync
     {
         private static SFLogger logger = SFLoggerFactory.GetLogger<SFConnectionPoolITAsync>();
-        private static readonly PoolConfig previousPoolConfig = new PoolConfig();
+        private static readonly PoolConfigRestorer s_previousPoolConfigRestorer = new PoolConfigRestorer();
 
         [SetUp]
         public void BeforeTest()
         {
-            previousPoolConfig.Reset();
+            s_previousPoolConfigRestorer.Reset();
             SnowflakeDbConnectionPool.SetPooling(true);
             SnowflakeDbConnectionPool.ClearAllPools();
         }
 
         [TearDown]
         public void AfterTest()
         {
-            previousPoolConfig.Reset();
+            s_previousPoolConfigRestorer.Reset();
         }
 
         [OneTimeTearDown]

Snowflake.Data/Client/SnowflakeDbConnection.cs

@@ -246,39 +246,30 @@ public override void Open()
                 logger.Debug($"Open with a connection already opened: {_connectionState}");
                 return;
             }
-            SfSession = SnowflakeDbConnectionPool.GetSession(this.ConnectionString);
-            if (SfSession != null)
+            try
             {
+                OnSessionConnecting();
+                SfSession = SnowflakeDbConnectionPool.GetSession(ConnectionString, Password);
+                if (SfSession == null)
+                    throw new SnowflakeDbException(SFError.INTERNAL_ERROR, "Could not open session");
                 logger.Debug($"Connection open with pooled session: {SfSession.sessionId}");
+                OnSessionEstablished();
             }
-            else
+            catch (Exception e)
             {
-                SetSession();
-                try
+                // Otherwise when Dispose() is called, the close request would timeout.
+                _connectionState = ConnectionState.Closed;
+                logger.Error("Unable to connect: ", e);
+                if (e is SnowflakeDbException)
                 {
-                    SfSession.Open();
-                }
-                catch (Exception e)
-                {
-                    // Otherwise when Dispose() is called, the close request would timeout.
-                    _connectionState = ConnectionState.Closed;
-                    logger.Error("Unable to connect", e);
-                    if (!(e.GetType() == typeof(SnowflakeDbException)))
-                    {
-                        throw
-                           new SnowflakeDbException(
-                               e,
-                               SnowflakeDbException.CONNECTION_FAILURE_SSTATE,
-                               SFError.INTERNAL_ERROR,
-                               "Unable to connect. " + e.Message);
-                    }
-                    else
-                    {
-                        throw;
-                    }
+                    throw;
                 }
+                throw new SnowflakeDbException(
+                        e,
+                        SnowflakeDbException.CONNECTION_FAILURE_SSTATE,
+                        SFError.INTERNAL_ERROR,
+                        "Unable to connect. " + e.Message);
             }
-            OnSessionEstablished();
         }
 
         public override Task OpenAsync(CancellationToken cancellationToken)
@@ -289,19 +280,11 @@ public override Task OpenAsync(CancellationToken cancellationToken)
                 logger.Debug($"Open with a connection already opened: {_connectionState}");
                 return Task.CompletedTask;
             }
-            SfSession = SnowflakeDbConnectionPool.GetSession(this.ConnectionString);
-            if (SfSession != null)
-            {
-                logger.Debug($"Connection open with pooled session: {SfSession.sessionId}");
-                OnSessionEstablished();
-                return Task.CompletedTask;
-            }
-
             registerConnectionCancellationCallback(cancellationToken);
-            SetSession();
-
-            return SfSession.OpenAsync(cancellationToken).ContinueWith(
-                previousTask =>
+            OnSessionConnecting();
+            return SnowflakeDbConnectionPool
+                .GetSessionAsync(ConnectionString, Password, cancellationToken)
+                .ContinueWith(previousTask =>
                 {
                     if (previousTask.IsFaulted)
                     {
@@ -322,8 +305,9 @@ public override Task OpenAsync(CancellationToken cancellationToken)
                     }
                     else
                     {
-                        logger.Debug("All good");
                         // Only continue if the session was opened successfully
+                        SfSession = previousTask.Result;
+                        logger.Debug($"Connection open with pooled session: {SfSession.sessionId}");
                         OnSessionEstablished();
                     }
                 },
@@ -345,19 +329,14 @@ public void SetArrayBindStageCreated()
             _isArrayBindStageCreated = true;
         }
 
-        /// <summary>
-        /// Create a new SFsession with the connection string settings.
-        /// </summary>
-        /// <exception cref="SnowflakeDbException">If the connection string can't be processed</exception>
-        private void SetSession()
+        private void OnSessionConnecting()
         {
-            SfSession = new SFSession(ConnectionString, Password);
-            _connectionTimeout = (int)SfSession.connectionTimeout.TotalSeconds;
             _connectionState = ConnectionState.Connecting;
         }
 
         private void OnSessionEstablished()
         {
+            _connectionTimeout = (int)SfSession.connectionTimeout.TotalSeconds;
             _connectionState = ConnectionState.Open;
         }
 

Snowflake.Data/Client/SnowflakeDbConnectionPool.cs

@@ -1,4 +1,7 @@
-using Snowflake.Data.Core;
+using System.Security;
+using System.Threading;
+using System.Threading.Tasks;
+using Snowflake.Data.Core;
 using Snowflake.Data.Core.Session;
 using Snowflake.Data.Log;
 
@@ -8,12 +11,17 @@ public class SnowflakeDbConnectionPool
     {
         private static readonly SFLogger s_logger = SFLoggerFactory.GetLogger<SnowflakeDbConnectionPool>();
 
-        internal static SFSession GetSession(string connStr)
+        internal static SFSession GetSession(string connStr, SecureString password)
         {
             s_logger.Debug("SnowflakeDbConnectionPool::GetSession");
-            return SessionPoolSingleton.Instance.GetSession(connStr);
+            return SessionPoolSingleton.Instance.GetSession(connStr, password);
         }
-
+
+        internal static Task<SFSession> GetSessionAsync(string connStr, SecureString password, CancellationToken cancellationToken)
+        {
+            return SessionPoolSingleton.Instance.GetSessionAsync(connStr, password, cancellationToken);
+        }
+
         internal static bool AddSession(SFSession session)
         {
             s_logger.Debug("SnowflakeDbConnectionPool::AddSession");