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

#52704 spin-off for testing failing CI #53683

Closed
wants to merge 1 commit into from
Closed

#52704 spin-off for testing failing CI #53683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/libraries/System.Net.Http/src/System.Net.Http.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,7 @@
<Reference Include="System.Collections" />
<Reference Include="System.Collections.Concurrent" />
<Reference Include="System.Collections.NonGeneric" />
<Reference Include="System.Console" Condition="'$(Configuration)' == 'Debug'" />
<Reference Include="System.Console"/>
<Reference Include="System.Diagnostics.DiagnosticSource" />
<Reference Include="System.Diagnostics.Tracing" />
<Reference Include="System.IO.Compression" />
Expand Down
5 changes: 5 additions & 0 deletions src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http3Connection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ public override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage req
{
while (true)
{
Console.WriteLine($"H3 connection loop");
lock (SyncObj)
{
if (_connection == null)
Expand All @@ -182,12 +183,16 @@ public override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage req
_activeRequests.Add(quicStream, requestStream);
break;
}
Console.WriteLine($"H3 connection loop getting wait task");
waitTask = _connection.WaitForAvailableBidirectionalStreamsAsync(cancellationToken);
}

Console.WriteLine($"H3 connection loop waiting");
// Wait for an available stream (based on QUIC MAX_STREAMS) if there isn't one available yet.
await waitTask.ConfigureAwait(false);
Console.WriteLine($"H3 connection loop done waiting");
}
Console.WriteLine($"H3 connection loop done");

if (quicStream == null)
{
Expand Down
30 changes: 25 additions & 5 deletions src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http3.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public HttpClientHandlerTest_Http3(ITestOutputHelper output) : base(output)
{
}

[Theory]
/*[Theory]
[InlineData(10)] // 2 bytes settings value.
[InlineData(100)] // 4 bytes settings value.
[InlineData(10_000_000)] // 8 bytes settings value.
Expand Down Expand Up @@ -160,12 +160,12 @@ public async Task SendStreamLimitRequestsConcurrently_Succeeds(int streamLimit)
});

await new[] { clientTask, serverTask }.WhenAllOrAnyFailed(20_000);
}
}*/

[Theory]
[InlineData(10)]
[InlineData(100)]
[InlineData(1000)]
//[InlineData(100)]
//[InlineData(1000)]
public async Task SendMoreThanStreamLimitRequestsConcurrently_LastWaits(int streamLimit)
{
// This combination leads to a hang manifesting in CI only. Disabling it until there's more time to investigate.
Expand All @@ -190,12 +190,16 @@ public async Task SendMoreThanStreamLimitRequestsConcurrently_LastWaits(int stre
streams[i] = stream;
}

_output.WriteLine($"Server {streamLimit} streams openned.");

// Make the last request running independently.
var lastRequest = Task.Run(async () => {
using Http3LoopbackStream stream = await connection.AcceptRequestStreamAsync();
await stream.HandleRequestAsync();
});

_output.WriteLine($"Server last request content should not be completed yet IsCompleted={lastRequestContentStarted.Task.IsCompleted}");

// All the initial streamLimit streams are still opened so the last request cannot started yet.
Assert.False(lastRequestContentStarted.Task.IsCompleted);

Expand All @@ -207,10 +211,13 @@ public async Task SendMoreThanStreamLimitRequestsConcurrently_LastWaits(int stre
// After the first request is fully processed, the last request should unblock and get processed.
if (i == 0)
{
_output.WriteLine($"Server awaiting last request content Status={lastRequestContentStarted.Task.Status}");
await lastRequestContentStarted.Task;
_output.WriteLine($"Server awaited last request content Status={lastRequestContentStarted.Task.Status}");
}
}
await lastRequest;
_output.WriteLine($"Server finished");
});

Task clientTask = Task.Run(async () =>
Expand Down Expand Up @@ -240,6 +247,8 @@ public async Task SendMoreThanStreamLimitRequestsConcurrently_LastWaits(int stre
tasks[i] = client.SendAsync(request);
});

_output.WriteLine($"Client waiting for {streamLimit} streams to open.");

// Wait for the first streamLimit request to get started.
countdown.Wait();

Expand All @@ -259,17 +268,28 @@ public async Task SendMoreThanStreamLimitRequestsConcurrently_LastWaits(int stre
}))
};
var lastTask = client.SendAsync(last);
_output.WriteLine($"Client started the last request content Status={lastRequestContentStarted.Task.Status}.");

// Wait for all requests to finish. Whether the last request was pending is checked on the server side.
var responses = await Task.WhenAll(tasks);
_output.WriteLine($"Client {streamLimit} requests finished.");
foreach (var response in responses)
{
response.Dispose();
}
await lastTask;
_output.WriteLine($"Client finished.");
});

await new[] { clientTask, serverTask }.WhenAllOrAnyFailed(20_000);
try
{
await new[] { clientTask, serverTask }.WhenAllOrAnyFailed(20_000);
}
catch
{
throw;
//Environment.FailFast("On purpose crash to get a dump");
}
}

[Fact]
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3084,7 +3084,7 @@ public sealed class SocketsHttpHandlerTest_Http3_Mock : HttpClientHandlerTest_Ht
protected override QuicImplementationProvider UseQuicImplementationProvider => QuicImplementationProviders.Mock;
}

[ConditionalClass(typeof(HttpClientHandlerTestBase), nameof(IsMsQuicSupported))]
/*[ConditionalClass(typeof(HttpClientHandlerTestBase), nameof(IsMsQuicSupported))]
public sealed class SocketsHttpHandlerTest_HttpClientHandlerTest_Http3_MsQuic : HttpClientHandlerTest
{
public SocketsHttpHandlerTest_HttpClientHandlerTest_Http3_MsQuic(ITestOutputHelper output) : base(output) { }
Expand Down Expand Up @@ -3187,5 +3187,5 @@ public sealed class SocketsHttpHandler_HttpClientHandler_Finalization_Http3_Mock
public SocketsHttpHandler_HttpClientHandler_Finalization_Http3_Mock(ITestOutputHelper output) : base(output) { }
protected override Version UseVersion => HttpVersion.Version30;
protected override QuicImplementationProvider UseQuicImplementationProvider => QuicImplementationProviders.Mock;
}
}*/
}
2 changes: 1 addition & 1 deletion src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<Reference Include="System.Collections" />
<Reference Include="System.Collections.Concurrent" />
<Reference Include="System.Collections.NonGeneric" />
<Reference Include="System.Console" Condition="'$(Configuration)' == 'Debug'" />
<Reference Include="System.Console"/>
<Reference Include="System.Diagnostics.Tracing" />
<Reference Include="System.Memory" />
<Reference Include="System.Net.Primitives" />
Expand Down
3 changes: 3 additions & 0 deletions src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/Mock/MockStream.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,17 +205,20 @@ internal override ValueTask ShutdownCompleted(CancellationToken cancellationToke

internal override void Shutdown()
{
Console.WriteLine($"MockStream shutdown {this.StreamId}");
CheckDisposed();

// This seems to mean shutdown send, in particular, not both.
WriteStreamBuffer?.EndWrite();

if (_streamState._inboundStreamBuffer is null) // unidirectional stream
{
Console.WriteLine($"MockStream unidi decrement {this.StreamId}");
_connection.LocalStreamLimit!.Unidirectional.Decrement();
}
else
{
Console.WriteLine($"MockStream bidi decrement {this.StreamId}");
_connection.LocalStreamLimit!.Bidirectional.Decrement();
}
}
Expand Down