From 4d57739bb0176d95d3d14ebf294b2913ef7d1259 Mon Sep 17 00:00:00 2001 From: Florian Lemaitre Date: Tue, 16 Apr 2024 08:51:19 +0200 Subject: [PATCH 1/2] Add log that process has crashed --- Worker/src/DLLWorker/Dockerfile | 5 ++++- Worker/src/DLLWorker/entry.sh | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100755 Worker/src/DLLWorker/entry.sh diff --git a/Worker/src/DLLWorker/Dockerfile b/Worker/src/DLLWorker/Dockerfile index e0a3cbc6..deeb3986 100644 --- a/Worker/src/DLLWorker/Dockerfile +++ b/Worker/src/DLLWorker/Dockerfile @@ -32,6 +32,9 @@ RUN case "$TARGETARCH" in \ dotnet publish "ArmoniK.DevelopmentKit.Worker.DLLWorker.csproj" -c "${BUILD_CONFIG}" -f net6.0 -o /app/publish -r "${DOTNET_ARCH}" --self-contained true FROM base AS final + +COPY ["Worker/src/DLLWorker/entry.sh", "/entry.sh"] + WORKDIR /app COPY --from=publish /app/publish . ENV LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH @@ -39,4 +42,4 @@ RUN groupadd --gid 5000 armonikuser && useradd --home-dir /home/armonikuser --cr RUN mkdir /cache /data && chown armonikuser: /cache /data USER armonikuser -ENTRYPOINT ["dotnet", "ArmoniK.DevelopmentKit.Worker.DLLWorker.dll"] +ENTRYPOINT ["/entry.sh", "dotnet", "ArmoniK.DevelopmentKit.Worker.DLLWorker.dll"] diff --git a/Worker/src/DLLWorker/entry.sh b/Worker/src/DLLWorker/entry.sh new file mode 100755 index 00000000..c9db39de --- /dev/null +++ b/Worker/src/DLLWorker/entry.sh @@ -0,0 +1,21 @@ +#! /bin/sh + +# Enable coredumps +ulimit -c unlimited + +# Rip child processes +trap 'kill -s INT -- -$$' INT +trap 'kill -s TERM -- -$$' TERM + +# Launch command in background to be sure it will be ripped +"$@" & +wait $! +ret="$?" + +# Add log that process has crashed +if [ "$ret" = 139 ]; then + echo "$@" "CRASHED" +fi + +# Forward the status code +exit "$ret" From bef0fd877a7db0c281870470a67dc29c4baad87b Mon Sep 17 00:00:00 2001 From: Nicolas Gruel Date: Tue, 23 Apr 2024 09:18:27 +0200 Subject: [PATCH 2/2] Upgrade API to 3.17.0 and Core 0.24.0 --- .github/workflows/build.yml | 4 ++-- .../ArmoniK.DevelopmentKit.Client.Common.csproj | 7 +++++-- .../ArmoniK.DevelopmentKit.Client.Symphony.csproj | 3 ++- .../ArmoniK.DevelopmentKit.Client.Unified.csproj | 4 +++- .../src/Common/ArmoniK.DevelopmentKit.Common.csproj | 2 +- .../ArmoniK.EndToEndTests.Common.csproj | 12 +++++++----- .../ArmoniK.DevelopmentKit.Worker.Common.csproj | 2 +- 7 files changed, 21 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 43de3571..91bd177f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -181,7 +181,7 @@ jobs: tls: ${{ matrix.tls }} mtls: ${{ matrix.mtls }} ext-csharp-version: ${{ needs.versionning.outputs.version }} - core-version: 0.23.2 + core-version: 0.24.0 - name: Setup hosts file run : echo -e "$(kubectl get svc ingress -n armonik -o jsonpath={.status.loadBalancer.ingress[0].ip})\tarmonik.local" | sudo tee -a /etc/hosts @@ -304,7 +304,7 @@ jobs: working-directory: ${{ github.workspace }}/infra type: localhost ext-csharp-version: ${{ needs.versionning.outputs.version }} - core-version: 0.23.2 + core-version: 0.24.0 - name: Run Test timeout-minutes: 20 diff --git a/Client/src/Common/ArmoniK.DevelopmentKit.Client.Common.csproj b/Client/src/Common/ArmoniK.DevelopmentKit.Client.Common.csproj index e19fcb46..990f3414 100644 --- a/Client/src/Common/ArmoniK.DevelopmentKit.Client.Common.csproj +++ b/Client/src/Common/ArmoniK.DevelopmentKit.Client.Common.csproj @@ -8,9 +8,12 @@ - + + - + + + diff --git a/Client/src/Symphony/ArmoniK.DevelopmentKit.Client.Symphony.csproj b/Client/src/Symphony/ArmoniK.DevelopmentKit.Client.Symphony.csproj index 72614760..273751fa 100644 --- a/Client/src/Symphony/ArmoniK.DevelopmentKit.Client.Symphony.csproj +++ b/Client/src/Symphony/ArmoniK.DevelopmentKit.Client.Symphony.csproj @@ -9,8 +9,9 @@ + - + diff --git a/Client/src/Unified/ArmoniK.DevelopmentKit.Client.Unified.csproj b/Client/src/Unified/ArmoniK.DevelopmentKit.Client.Unified.csproj index 2db5a87d..d562a242 100644 --- a/Client/src/Unified/ArmoniK.DevelopmentKit.Client.Unified.csproj +++ b/Client/src/Unified/ArmoniK.DevelopmentKit.Client.Unified.csproj @@ -8,8 +8,10 @@ + - + + diff --git a/Common/src/Common/ArmoniK.DevelopmentKit.Common.csproj b/Common/src/Common/ArmoniK.DevelopmentKit.Common.csproj index f344e851..d4b9dc58 100644 --- a/Common/src/Common/ArmoniK.DevelopmentKit.Common.csproj +++ b/Common/src/Common/ArmoniK.DevelopmentKit.Common.csproj @@ -9,7 +9,7 @@ - + diff --git a/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Common/ArmoniK.EndToEndTests.Common.csproj b/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Common/ArmoniK.EndToEndTests.Common.csproj index b72f587a..2e059028 100644 --- a/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Common/ArmoniK.EndToEndTests.Common.csproj +++ b/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Common/ArmoniK.EndToEndTests.Common.csproj @@ -12,11 +12,13 @@ - - - - - + + + + + + + diff --git a/Worker/src/Common/ArmoniK.DevelopmentKit.Worker.Common.csproj b/Worker/src/Common/ArmoniK.DevelopmentKit.Worker.Common.csproj index 2cc2d799..88a9afe7 100644 --- a/Worker/src/Common/ArmoniK.DevelopmentKit.Worker.Common.csproj +++ b/Worker/src/Common/ArmoniK.DevelopmentKit.Worker.Common.csproj @@ -8,7 +8,7 @@ - +