Skip to content

Fix | Fix driver behavior to use CancellationTokenResource only for non-infinite timeout and cleanup after usage. #339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Dec 3, 2019
Merged

Fix | Fix driver behavior to use CancellationTokenResource only for non-infinite timeout and cleanup after usage. #339

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
85ef645
Merge pull request #1 from dotnet/master
karinazhou Aug 28, 2019
3351abd
Merge branch 'master' of https://github.com/dotnet/SqlClient
karinazhou Aug 28, 2019
5b34d06
Merge pull request #2 from dotnet/master
karinazhou Sep 16, 2019
ca1c910
Merge pull request #3 from dotnet/master
karinazhou Sep 18, 2019
4a2e322
Merge pull request #4 from dotnet/master
karinazhou Sep 20, 2019
06f29a3
Merge pull request #5 from dotnet/master
karinazhou Oct 3, 2019
06a02b9
Merge pull request #6 from dotnet/master
karinazhou Oct 11, 2019
cef6b8b
Merge branch 'master' of https://github.com/dotnet/SqlClient
karinazhou Nov 8, 2019
fedd72e
Merge branch 'master' of https://github.com/dotnet/SqlClient
karinazhou Nov 22, 2019
735da27
Merge branch 'master' of https://github.com/dotnet/SqlClient
karinazhou Nov 25, 2019
ae50df8
Merge branch 'master' of https://github.com/dotnet/SqlClient
karinazhou Dec 2, 2019
475e621
Use CancellationTokenResource only for non-infinite timeout
karinazhou Dec 2, 2019
4862191
formatting and minor change to ctor
karinazhou Dec 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 29 additions & 26 deletions src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SNITcpHandle.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,17 +198,8 @@ private static Socket Connect(string serverName, int port, TimeSpan timeout, boo
ipAddresses = new IPAddress[] { serverIPv4, serverIPv6 };
Socket[] sockets = new Socket[2];

CancellationTokenSource cts = new CancellationTokenSource();
CancellationTokenSource cts = null;

if (isInfiniteTimeout)
{
cts.CancelAfter(-1);
}
else
{
cts.CancelAfter(timeout);
}

void Cancel()
{
for (int i = 0; i < sockets.Length; ++i)
Expand All @@ -224,33 +215,45 @@ void Cancel()
catch { }
}
}
cts.Token.Register(Cancel);

if (!isInfiniteTimeout)
{
cts = new CancellationTokenSource(timeout);
cts.Token.Register(Cancel);
}

Socket availableSocket = null;
for (int i = 0; i < sockets.Length; ++i)
try
{
try
for (int i = 0; i < sockets.Length; ++i)
{
if (ipAddresses[i] != null)
try
{
sockets[i] = new Socket(ipAddresses[i].AddressFamily, SocketType.Stream, ProtocolType.Tcp);
sockets[i].Connect(ipAddresses[i], port);
if (sockets[i] != null) // sockets[i] can be null if cancel callback is executed during connect()
if (ipAddresses[i] != null)
{
if (sockets[i].Connected)
{
availableSocket = sockets[i];
break;
}
else
sockets[i] = new Socket(ipAddresses[i].AddressFamily, SocketType.Stream, ProtocolType.Tcp);
sockets[i].Connect(ipAddresses[i], port);
if (sockets[i] != null) // sockets[i] can be null if cancel callback is executed during connect()
{
sockets[i].Dispose();
sockets[i] = null;
if (sockets[i].Connected)
{
availableSocket = sockets[i];
break;
}
else
{
sockets[i].Dispose();
sockets[i] = null;
}
}
}
}
catch { }
}
catch { }
}
finally
{
cts?.Dispose();
}

return availableSocket;
Expand Down