Skip to content

[HTTP/3] Stress hack for msquic dropping connections #84793

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
ManickaP merged 13 commits into from
Apr 28, 2023
Merged

[HTTP/3] Stress hack for msquic dropping connections #84793

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
df45d59
Implement the same hack as for functional tests to prevent msquic fro…
ManickaP Apr 13, 2023
df7b541
Feedback: removed code sharing and used reflaction
ManickaP Apr 14, 2023
bd6c04d
Try to fix missing build dependency
ManickaP Apr 14, 2023
fa5820e
Feedback - removed test only function and replaced with shared code +…
ManickaP Apr 20, 2023
b649716
Merge branch 'main' into mapichov/h3-stress-msquic-hack
antonfirsov Apr 25, 2023
ed73b02
fix argument handling in build-local.ps1
antonfirsov Apr 25, 2023
7e4d512
do not use MsQuicLibraryVersion
antonfirsov Apr 25, 2023
1f8f56e
copy msquic interop utils to the SDK base image
antonfirsov Apr 26, 2023
d2c113c
use LinkBase in Functional.Tests.csproj for wildcard include
antonfirsov Apr 26, 2023
7613f06
Merge branch 'main' into mapichov/h3-stress-msquic-hack
antonfirsov Apr 26, 2023
0a9731f
Use MsQuicLibraryVersion in out internal logging and as a side-effect…
ManickaP Apr 27, 2023
e316a13
Comment
ManickaP Apr 27, 2023
949d82b
also copy files to the Linux container
antonfirsov Apr 27, 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
Prev Previous commit
Next Next commit
copy msquic interop utils to the SDK base image
  • Loading branch information
@antonfirsov
antonfirsov committed Apr 26, 2023
commit 1f8f56e4e145e087bf525be8b76fc10c026d89d2
3 changes: 3 additions & 0 deletions eng/docker/build-docker-sdk.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ if ($buildWindowsContainers)
# 2. Runtime pack (microsoft.netcore.app.runtime.win-x64)
# 3. targetingpacks.targets, so stress test builds can target the live-built runtime instead of the one in the pre-installed SDK
# 4. testhost
# 5. msquic interop sources (needed for HttpStress)
$binArtifacts = "$REPO_ROOT_DIR\artifacts\bin"
$dockerContext = "$REPO_ROOT_DIR\artifacts\docker-context"

Expand All @@ -51,6 +52,8 @@ if ($buildWindowsContainers)
-Destination $dockerContext\testhost
Copy-Item -Recurse -Path $REPO_ROOT_DIR\eng\targetingpacks.targets `
-Destination $dockerContext\targetingpacks.targets
Copy-Item -Recurse -Path $REPO_ROOT_DIR\src\libraries\System.Net.Quic\src\System\Net\Quic\Interop `
-Destination $dockerContext\msquic-interop

# In case of non-CI builds, testhost may already contain Microsoft.AspNetCore.App (see build-local.ps1 in HttpStress):
$testHostAspNetCorePath="$dockerContext\testhost\net$dotNetVersion-windows-$configuration-x64/shared/Microsoft.AspNetCore.App"
Expand Down
5 changes: 3 additions & 2 deletions src/libraries/System.Net.Http/tests/StressTests/HttpStress/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@

<!-- Stress projects have their own global.json, the directory above that also has it is the repository root. -->
<RepositoryRoot>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)../, global.json))/</RepositoryRoot>


<MsQuicInteropIncludes Condition="'$(MsQuicInteropIncludes)' == ''">$(RepositoryRoot)src/libraries/System.Net.Quic/src/System/Net/Quic/Interop/*.cs</MsQuicInteropIncludes>
<TargetingPacksTargetsLocation Condition="'$(TargetingPacksTargetsLocation)' == ''">$(RepositoryRoot)eng/targetingpacks.targets</TargetingPacksTargetsLocation>
<ProductVersion>8.0.0</ProductVersion>
<NetCoreAppCurrent>net8.0</NetCoreAppCurrent>
Expand All @@ -14,4 +15,4 @@
<MicrosoftNetCoreAppRefPackDir Condition="'$(MicrosoftNetCoreAppRefPackDir)' == ''" >$(RepositoryRoot)artifacts/bin/microsoft.netcore.app.ref/</MicrosoftNetCoreAppRefPackDir>
<MicrosoftNetCoreAppRuntimePackDir Condition="'$(MicrosoftNetCoreAppRuntimePackDir)' == ''">$(RepositoryRoot)artifacts/bin/microsoft.netcore.app.runtime.$(OutputRID)/$(Configuration)/</MicrosoftNetCoreAppRuntimePackDir>
</PropertyGroup>
</Project>
</Project>
2 changes: 1 addition & 1 deletion src/libraries/System.Net.Http/tests/StressTests/HttpStress/HttpStress.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<!-- Shared production code -->
<ItemGroup>
<Compile Include="..\..\..\..\System.Net.Quic\src\System\Net\Quic\Interop\*.cs" Link="ProductionCode\System\Net\Quic\Interop\*.cs" />
<Compile Include="$(MsQuicInteropIncludes)" LinkBase="MsQuicInterop" />
</ItemGroup>

<PropertyGroup>
Expand Down
1 change: 1 addition & 0 deletions src/libraries/System.Net.Http/tests/StressTests/HttpStress/windows.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ ARG VERSION=8.0
ARG CONFIGURATION=Release

RUN dotnet build -c $env:CONFIGURATION `
-p:MsQuicInteropIncludes="C:/live-runtime-artifacts/msquic-interop/*.cs" `
-p:TargetingPacksTargetsLocation=C:/live-runtime-artifacts/targetingpacks.targets `
-p:MicrosoftNetCoreAppRefPackDir=C:/live-runtime-artifacts/microsoft.netcore.app.ref/ `
-p:MicrosoftNetCoreAppRuntimePackDir=C:/live-runtime-artifacts/microsoft.netcore.app.runtime.win-x64/$env:CONFIGURATION/
Expand Down