[Release/2.0] Fix transient fault handling for Pooled connections (#638)

dotnet · Jul 21, 2020 · d9999d6 · d9999d6
1 parent 2881d67
commit d9999d6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/...Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs b/...Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs
@@ -545,6 +545,8 @@ private bool IsTransientError(SqlException exc)
             {
                 if (s_transientErrors.Contains(error.Number))
                 {
+                    // When server timeouts, connection is doomed. Reset here to allow reconnect.
+                    UnDoomThisConnection();
                     return true;
                 }
             }
@@ -1629,7 +1631,7 @@ private bool AttemptRetryADAuthWithTimeoutError(SqlException sqlex, SqlConnectio
             timeout.Reset();
             // When server timeout, the auth context key was already created. Clean it up here.
             _dbConnectionPoolAuthenticationContextKey = null;
-            // When server timeout, connection is doomed. Reset here to allow reconnect.
+            // When server timeouts, connection is doomed. Reset here to allow reconnect.
             UnDoomThisConnection();
             // Change retry state so it only retries once for timeout error.
             _activeDirectoryAuthTimeoutRetryHelper.State = ActiveDirectoryAuthenticationTimeoutRetryState.Retrying;

diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs
@@ -633,6 +633,8 @@ private bool IsTransientError(SqlException exc)
             {
                 if (transientErrors.Contains(error.Number))
                 {
+                    // When server timeouts, connection is doomed. Reset here to allow reconnect.
+                    UnDoomThisConnection();
                     return true;
                 }
             }
@@ -1977,7 +1979,7 @@ private bool AttemptRetryADAuthWithTimeoutError(SqlException sqlex, SqlConnectio
             timeout.Reset();
             // When server timeout, the auth context key was already created. Clean it up here.
             _dbConnectionPoolAuthenticationContextKey = null;
-            // When server timeout, connection is doomed. Reset here to allow reconnect.
+            // When server timeouts, connection is doomed. Reset here to allow reconnect.
             UnDoomThisConnection();
             // Change retry state so it only retries once for timeout error.
             _activeDirectoryAuthTimeoutRetryHelper.State = ActiveDirectoryAuthenticationTimeoutRetryState.Retrying;