Fix connection resiliency check (dotnet#310)

David-Engel · web-flow · commit 6085573893cc · 2019-11-15T11:22:09.000-08:00
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlConnection.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlConnection.cs
@@ -1136,7 +1136,7 @@ internal Task ValidateAndReconnect(Action beforeDisconnect, int timeout)
                                             {
                                             }
                                             // use Task.Factory.StartNew with state overload instead of Task.Run to avoid anonymous closure context capture in method scope and avoid the unneeded allocation
-                                            runningReconnect = Task.Factory.StartNew(state => ReconnectAsync((int)state), timeout, CancellationToken.None, TaskCreationOptions.DenyChildAttach, TaskScheduler.Default);
+                                            runningReconnect = Task.Factory.StartNew(state => ReconnectAsync((int)state), timeout, CancellationToken.None, TaskCreationOptions.DenyChildAttach, TaskScheduler.Default).Unwrap();
                                             // if current reconnect is not null, somebody already started reconnection task - some kind of race condition
                                             Debug.Assert(_currentReconnectionTask == null, "Duplicate reconnection tasks detected");
                                             _currentReconnectionTask = runningReconnect;
@@ -1161,7 +1161,7 @@ internal Task ValidateAndReconnect(Action beforeDisconnect, int timeout)
                                 OnError(SQL.CR_UnrecoverableServer(ClientConnectionId), true, null);
                             }
                         } // ValidateSNIConnection
-                    } // sessionRecoverySupported                  
+                    } // sessionRecoverySupported
                 } // connectRetryCount>0
             }
             else

Original file line number	Diff line number	Diff line change
`@@ -1136,7 +1136,7 @@ internal Task ValidateAndReconnect(Action beforeDisconnect, int timeout)`
`1136`	`1136`	`{`
`1137`	`1137`	`}`
`1138`	`1138`	`// use Task.Factory.StartNew with state overload instead of Task.Run to avoid anonymous closure context capture in method scope and avoid the unneeded allocation`
`1139`		`- runningReconnect = Task.Factory.StartNew(state => ReconnectAsync((int)state), timeout, CancellationToken.None, TaskCreationOptions.DenyChildAttach, TaskScheduler.Default);`
	`1139`	`+ runningReconnect = Task.Factory.StartNew(state => ReconnectAsync((int)state), timeout, CancellationToken.None, TaskCreationOptions.DenyChildAttach, TaskScheduler.Default).Unwrap();`
`1140`	`1140`	`// if current reconnect is not null, somebody already started reconnection task - some kind of race condition`
`1141`	`1141`	`Debug.Assert(_currentReconnectionTask == null, "Duplicate reconnection tasks detected");`
`1142`	`1142`	`_currentReconnectionTask = runningReconnect;`
`@@ -1161,7 +1161,7 @@ internal Task ValidateAndReconnect(Action beforeDisconnect, int timeout)`
`1161`	`1161`	`OnError(SQL.CR_UnrecoverableServer(ClientConnectionId), true, null);`
`1162`	`1162`	`}`
`1163`	`1163`	`} // ValidateSNIConnection`
`1164`		`- } // sessionRecoverySupported`
	`1164`	`+ } // sessionRecoverySupported`
`1165`	`1165`	`} // connectRetryCount>0`
`1166`	`1166`	`}`
`1167`	`1167`	`else`