From b81ce9e1da1f9397a460953f2270d05b90f57a39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Tue, 21 Jan 2025 15:10:18 +0100 Subject: [PATCH 1/6] Fix linux build image in eng/pipelines/libraries/stress/http.yml --- eng/pipelines/libraries/stress/http.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/libraries/stress/http.yml b/eng/pipelines/libraries/stress/http.yml index 83aff8d9bb7d51..257334fce3e99c 100644 --- a/eng/pipelines/libraries/stress/http.yml +++ b/eng/pipelines/libraries/stress/http.yml @@ -38,7 +38,7 @@ extends: DUMPS_SHARE: "$(Build.ArtifactStagingDirectory)/dumps/" pool: name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals 1es-ubuntu-1804-open + demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open steps: - checkout: self From 762f741c4d7f2b2f9fb3f4246f10cb6bd431726c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Wed, 22 Jan 2025 17:18:37 +0100 Subject: [PATCH 2/6] Align docker-compose.yml with the one from SslStress --- .../tests/StressTests/HttpStress/docker-compose.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/docker-compose.yml b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/docker-compose.yml index a42a0c72810d59..302b93aaa95095 100644 --- a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/docker-compose.yml +++ b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/docker-compose.yml @@ -1,8 +1,9 @@ +version: '3' # Although the version attribute is obsolete and should be ignored, it's seemingly not the case on Build.Ubuntu.2204.Amd64.Open services: client: build: - context: . - dockerfile: ${DOCKERFILE:-Dockerfile} + context: ../../../../ # ~> src/libraries + dockerfile: ./System.Net.Security/tests/StressTests/HttpStress/${DOCKERFILE:-Dockerfile} image: httpstress volumes: - "${DUMPS_SHARE}:${DUMPS_SHARE_MOUNT_ROOT}" @@ -14,8 +15,8 @@ services: - DUMPS_SHARE_MOUNT_ROOT=${DUMPS_SHARE_MOUNT_ROOT} server: build: - context: . - dockerfile: ${DOCKERFILE:-Dockerfile} + context: ../../../../ # ~> src/libraries + dockerfile: ./System.Net.Security/tests/StressTests/HttpStress/${DOCKERFILE:-Dockerfile} image: httpstress volumes: - "${DUMPS_SHARE}:${DUMPS_SHARE_MOUNT_ROOT}" From 9f2f2e10e4235f3c81d399f400232244f954d4dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Wed, 22 Jan 2025 18:55:29 +0100 Subject: [PATCH 3/6] Fix copy/paste mistake --- .../tests/StressTests/HttpStress/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/docker-compose.yml b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/docker-compose.yml index 302b93aaa95095..a234ef783f04e1 100644 --- a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/docker-compose.yml +++ b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/docker-compose.yml @@ -3,7 +3,7 @@ services: client: build: context: ../../../../ # ~> src/libraries - dockerfile: ./System.Net.Security/tests/StressTests/HttpStress/${DOCKERFILE:-Dockerfile} + dockerfile: ./System.Net.Http/tests/StressTests/HttpStress/${DOCKERFILE:-Dockerfile} image: httpstress volumes: - "${DUMPS_SHARE}:${DUMPS_SHARE_MOUNT_ROOT}" @@ -16,7 +16,7 @@ services: server: build: context: ../../../../ # ~> src/libraries - dockerfile: ./System.Net.Security/tests/StressTests/HttpStress/${DOCKERFILE:-Dockerfile} + dockerfile: ./System.Net.Http/tests/StressTests/HttpStress/${DOCKERFILE:-Dockerfile} image: httpstress volumes: - "${DUMPS_SHARE}:${DUMPS_SHARE_MOUNT_ROOT}" From f5e4269169070d9c720d92eb4b55e956a37148c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Wed, 22 Jan 2025 19:56:43 +0100 Subject: [PATCH 4/6] Set correct WORKDIR --- .../System.Net.Http/tests/StressTests/HttpStress/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/Dockerfile b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/Dockerfile index 770a7829ce3e78..f39efbd93f13de 100644 --- a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/Dockerfile +++ b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/Dockerfile @@ -26,6 +26,7 @@ ARG CONFIGURATION # Build the stress server WORKDIR /app COPY . . +WORKDIR /app/System.Net.Http/tests/StressTests/HttpStress RUN dotnet build -c $CONFIGURATION \ -p:NetCoreAppCurrentVersion=$VERSION \ From c31c7df65359f057e0a1dd9fb7300d290b29490d Mon Sep 17 00:00:00 2001 From: Radek Zikmund Date: Thu, 23 Jan 2025 11:09:36 +0100 Subject: [PATCH 5/6] fix --- .../tests/StressTests/HttpStress/Dockerfile | 1 - .../tests/StressTests/HttpStress/docker-compose.yml | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/Dockerfile b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/Dockerfile index f39efbd93f13de..770a7829ce3e78 100644 --- a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/Dockerfile +++ b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/Dockerfile @@ -26,7 +26,6 @@ ARG CONFIGURATION # Build the stress server WORKDIR /app COPY . . -WORKDIR /app/System.Net.Http/tests/StressTests/HttpStress RUN dotnet build -c $CONFIGURATION \ -p:NetCoreAppCurrentVersion=$VERSION \ diff --git a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/docker-compose.yml b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/docker-compose.yml index a234ef783f04e1..ddce0b945ea6fd 100644 --- a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/docker-compose.yml +++ b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/docker-compose.yml @@ -2,8 +2,8 @@ version: '3' # Although the version attribute is obsolete and should be ignored, services: client: build: - context: ../../../../ # ~> src/libraries - dockerfile: ./System.Net.Http/tests/StressTests/HttpStress/${DOCKERFILE:-Dockerfile} + context: . + dockerfile: ${DOCKERFILE:-Dockerfile} image: httpstress volumes: - "${DUMPS_SHARE}:${DUMPS_SHARE_MOUNT_ROOT}" @@ -15,8 +15,8 @@ services: - DUMPS_SHARE_MOUNT_ROOT=${DUMPS_SHARE_MOUNT_ROOT} server: build: - context: ../../../../ # ~> src/libraries - dockerfile: ./System.Net.Http/tests/StressTests/HttpStress/${DOCKERFILE:-Dockerfile} + context: . + dockerfile: ${DOCKERFILE:-Dockerfile} image: httpstress volumes: - "${DUMPS_SHARE}:${DUMPS_SHARE_MOUNT_ROOT}" From d05dea2ed88d2337af5ad18064383f627c04f870 Mon Sep 17 00:00:00 2001 From: Radek Zikmund Date: Thu, 23 Jan 2025 14:57:36 +0100 Subject: [PATCH 6/6] Disable asan --- .../tests/StressTests/HttpStress/Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/Dockerfile b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/Dockerfile index 770a7829ce3e78..cc9c5044486552 100644 --- a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/Dockerfile +++ b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/Dockerfile @@ -10,7 +10,8 @@ RUN apt-get update -y && \ RUN git clone --depth 1 --single-branch --branch v2.4.4 --recursive https://github.com/microsoft/msquic RUN cd msquic/ && \ mkdir build && \ - cmake -B build -DCMAKE_BUILD_TYPE=Debug -DQUIC_ENABLE_LOGGING=false -DQUIC_USE_SYSTEM_LIBCRYPTO=true -DQUIC_BUILD_TOOLS=off -DQUIC_BUILD_TEST=off -DQUIC_BUILD_PERF=off -DQUIC_TLS=openssl3 -DQUIC_ENABLE_SANITIZERS=on && \ + cmake -B build -DCMAKE_BUILD_TYPE=Debug -DQUIC_ENABLE_LOGGING=false -DQUIC_USE_SYSTEM_LIBCRYPTO=true -DQUIC_BUILD_TOOLS=off -DQUIC_BUILD_TEST=off -DQUIC_BUILD_PERF=off -DQUIC_TLS=openssl3 && \ + # -DQUIC_ENABLE_SANITIZERS=on && \ cd build && \ cmake --build . --config Debug RUN cd msquic/build/bin/Debug && \ @@ -42,7 +43,7 @@ ENV STRESS_ROLE='' ENV STRESS_ARGS='' # configure adress sanitizer -ENV ASAN_OPTIONS='detect_leaks=0' -ENV LD_PRELOAD=/usr/lib/gcc/x86_64-linux-gnu/12/libasan.so +# ENV ASAN_OPTIONS='detect_leaks=0' +# ENV LD_PRELOAD=/usr/lib/gcc/x86_64-linux-gnu/12/libasan.so CMD ./entrypoint.sh