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

Jump to bottom

Fix FailedRequests_ConnectionClosedWhileReceivingHeaders_Recorded #89047

Merged
merged 3 commits into from
Jul 18, 2023
Merged

Fix FailedRequests_ConnectionClosedWhileReceivingHeaders_Recorded #89047

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b61859e
fix FailedRequests_ConnectionClosedWhileReceivingHeaders_Recorded
antonfirsov Jul 17, 2023
9370b1e
avoid EstablishGenericConnectionAsync() hanging
antonfirsov Jul 17, 2023
dd2a30a
adjust test
antonfirsov Jul 17, 2023
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
26 changes: 17 additions & 9 deletions src/libraries/System.Net.Http/tests/FunctionalTests/MetricsTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,10 +530,10 @@ protected override void Dispose(bool disposing)
base.Dispose(disposing);
}

protected Task<HttpResponseMessage> SendAsync(HttpMessageInvoker invoker, HttpRequestMessage request) =>
protected Task<HttpResponseMessage> SendAsync(HttpMessageInvoker invoker, HttpRequestMessage request, CancellationToken cancellationToken = default) =>
TestHttpMessageInvoker ?
invoker.SendAsync(request, default) :
((HttpClient)invoker).SendAsync(TestAsync, request);
invoker.SendAsync(request, cancellationToken) :
((HttpClient)invoker).SendAsync(TestAsync, request, cancellationToken);

protected HttpMessageInvoker CreateHttpMessageInvoker(HttpMessageHandler? handler = null) =>
TestHttpMessageInvoker ?
Expand Down Expand Up @@ -617,24 +617,32 @@ await Assert.ThrowsAsync<HttpRequestException>(async () =>
[Fact]
public async Task FailedRequests_ConnectionClosedWhileReceivingHeaders_Recorded()
{
TimeSpan timeout = TimeSpan.FromSeconds(30);
using CancellationTokenSource cancelServerCts = new CancellationTokenSource();
await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
{
using HttpMessageInvoker client = CreateHttpMessageInvoker();
using InstrumentRecorder<long> recorder = SetupInstrumentRecorder<long>(InstrumentNames.FailedRequests);
using HttpRequestMessage request = new(HttpMethod.Get, uri) { Version = UseVersion };

await Assert.ThrowsAsync<HttpRequestException>(async () =>
Exception ex = await Assert.ThrowsAnyAsync<Exception>(async () =>
{
using HttpResponseMessage response = await SendAsync(client, request);
}).WaitAsync(timeout);
// Getting a cancellation is also good if we are unable to detect the peer shutdown.
using CancellationTokenSource cts = new CancellationTokenSource(10_000);
using HttpResponseMessage response = await SendAsync(client, request, cts.Token);
});
cancelServerCts.Cancel();
Assert.True(ex is HttpRequestException or TaskCanceledException);

Measurement<long> m = recorder.GetMeasurements().Single();
VerifyFailedRequests(m, 1, uri, null, null);
}, async server =>
{
var connection = (LoopbackServer.Connection)await server.EstablishGenericConnectionAsync().WaitAsync(timeout);
connection.Socket.Close();
try
{
var connection = (LoopbackServer.Connection)await server.EstablishGenericConnectionAsync().WaitAsync(cancelServerCts.Token);
connection.Socket.Close();
}
catch { }
});
}
}
Expand Down