SNOW-1276398 Fix not thrown exception when OpenAsync http request fails

Snowflake.Data.Tests/IntegrationTests/SFConnectionIT.cs

@@ -164,7 +164,7 @@ public void TestConnectionIsNotMarkedAsOpenWhenWasNotCorrectlyOpenedBefore(bool
         }
 
         [Test]
-        public void TestConnectionIsNotMarkedAsOpenWhenWasNotCorrectlyOpenedWithUsingClause()
+        public void TestConnectionIsNotMarkedAsOpenWhenWfasNotCorrectlyOpenedWithUsingClause()
         {
             for (int i = 0; i < 2; ++i)
             {
@@ -2271,6 +2271,53 @@ public void TestUseMultiplePoolsConnectionPoolByDefault()
             // assert
             Assert.AreEqual(ConnectionPoolType.MultipleConnectionPool, poolVersion);
         }
+
+        [Test]
+        public async Task TestShouldThrowExceptionWhenTaskCanceledWhenOpenAsync()
+        {
+            // act
+            var connectionString = "account=myaccount.servername; " +
+                                      " user=admin; password=password; role=ACCOUNTADMIN;" +
+                                      " DB=TEST_DB; warehouse=COMPUTE_WH;" +
+                                      " useproxy=true;proxyhost=no.such.pro.xy;proxyport=8080";
+
+            using (var connection = new SnowflakeDbConnection())
+            {
+                try{
+                    connection.ConnectionString = connectionString;
+                    Task t = connection.OpenAsync();
+                    t.Wait();
+                }
+                catch (Exception e)
+                {
+                    Assert.IsInstanceOf<SnowflakeDbException>(e.InnerException);
+                }
+            }
+        }
+
+        [Test]
+        public async Task TestConnectionAsyncTimeoutWithMaxRetryReached()
+        {
+            var mockRestRequester = new MockRetryUntilRestTimeoutRestRequester()
+            {
+                _forceTimeoutForNonLoginRequestsOnly = false
+            };
+
+            using (DbConnection connection = new MockSnowflakeDbConnection(mockRestRequester))
+            {
+                string maxRetryConnStr = ConnectionString + "maxHttpRetries=8;poolingEnabled=true";
+
+                connection.ConnectionString = maxRetryConnStr;
+                try{
+                    Task t = connection.OpenAsync();
+                    t.Wait();
+                }
+                catch (Exception e)
+                {
+                    Assert.IsInstanceOf<TaskCanceledException>(e.InnerException);
+                }
+            }
+        }
     }
 }
 

Snowflake.Data/Client/SnowflakeDbConnection.cs

@@ -318,11 +318,6 @@ public override Task OpenAsync(CancellationToken cancellationToken)
                            SFError.INTERNAL_ERROR,
                            "Unable to connect");
                     }
-                    else if (previousTask.IsCanceled)
-                    {
-                        _connectionState = ConnectionState.Closed;
-                        logger.Debug("Connection canceled");
-                    }
                     else
                     {
                         // Only continue if the session was opened successfully
@@ -331,7 +326,7 @@ public override Task OpenAsync(CancellationToken cancellationToken)
                         OnSessionEstablished();
                     }
                 },
-                cancellationToken);
+                TaskContinuationOptions.NotOnCanceled);
         }
 
         public Mutex GetArrayBindingMutex()

Snowflake.Data/Core/HttpUtil.cs

@@ -17,6 +17,8 @@
 
 namespace Snowflake.Data.Core
 {
+    using Client;
+
     public class HttpClientConfig
     {
         public HttpClientConfig(
@@ -87,7 +89,7 @@ public sealed class HttpUtil
 
         private HttpUtil()
         {
-            // This value is used by AWS SDK and can cause deadlock, 
+            // This value is used by AWS SDK and can cause deadlock,
             // so we need to increase the default value of 2
             // See: https://github.com/aws/aws-sdk-net/issues/152
             ServicePointManager.DefaultConnectionLimit = 50;
@@ -181,15 +183,15 @@ internal HttpMessageHandler SetupCustomHttpHandler(HttpClientConfig config)
                     {
                         // Get the original entry
                         entry = bypassList[i].Trim();
-                        // . -> [.] because . means any char 
+                        // . -> [.] because . means any char
                         entry = entry.Replace(".", "[.]");
                         // * -> .*  because * is a quantifier and need a char or group to apply to
                         entry = entry.Replace("*", ".*");
-                        
+
                         entry = entry.StartsWith("^") ? entry : $"^{entry}";
-                        
+
                         entry = entry.EndsWith("$") ? entry : $"{entry}$";
-                        
+
                         // Replace with the valid entry syntax
                         bypassList[i] = entry;
 
@@ -373,7 +375,7 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
 
                 while (true)
                 {
-
+                    Exception toThrow = null;
                     try
                     {
                         childCts = null;
@@ -384,7 +386,7 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
                             if (httpTimeout.Ticks == 0)
                                 childCts.Cancel();
                             else
-                                childCts.CancelAfter(httpTimeout);                        
+                                childCts.CancelAfter(httpTimeout);
                         }
                         response = await base.SendAsync(requestMessage, childCts == null ?
                             cancellationToken : childCts.Token).ConfigureAwait(false);
@@ -406,6 +408,7 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
                             //TODO: Should probably check to see if the error is recoverable or transient.
                             logger.Warn("Error occurred during request, retrying...", e);
                         }
+                        toThrow = e;
                     }
 
                     if (childCts != null)
@@ -454,7 +457,14 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
                         {
                             return response;
                         }
-                        throw new OperationCanceledException($"http request failed and max retry {maxRetryCount} reached");
+
+                        if (toThrow is TaskCanceledException)
+                        {
+                            throw toThrow;
+                        }
+                        throw new SnowflakeDbException(toThrow, SFError.INTERNAL_ERROR,
+                            $"Http request failed and max retry {maxRetryCount} reached");
+
                     }
 
                     // Disposing of the response if not null now that we don't need it anymore