Skip to content
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

In Dns.RunAsync calls AfterResolution when canceled #104435

Merged
merged 3 commits into from
Jul 10, 2024
Merged

In Dns.RunAsync calls AfterResolution when canceled #104435

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
31fcb6f
Calling AfterResolution when canceled
rokonec Jul 4, 2024
1e53d84
revert .sln files
rokonec Jul 4, 2024
ce9757f
Mark log entry with OperationCanceledException
rokonec Jul 8, 2024
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
3 changes: 3 additions & 0 deletions src/libraries/System.Net.NameResolution/src/System/Net/Dns.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,6 +694,9 @@ private static Task<TResult> RunAsync<TResult>(Func<object, long, TResult> func,
lock (s_tasks)
{
((ICollection<KeyValuePair<object, Task>>)s_tasks).Remove(new KeyValuePair<object, Task>(key!, task));
// Since it was canceled, func(..) had not executed and call AfterResolution it needs to be called here.
NameResolutionTelemetry.Log.AfterResolution(key!, startingTimestamp);
rokonec marked this conversation as resolved.
Show resolved Hide resolved

rokonec marked this conversation as resolved.
Show resolved Hide resolved
}
}, key, CancellationToken.None, TaskContinuationOptions.OnlyOnCanceled | TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default);
}
Expand Down
Loading