From 2e06189bfb9f8ea7d80ed24e09516892dac53fa0 Mon Sep 17 00:00:00 2001 From: Pjandro Date: Wed, 21 Oct 2026 22:26:16 +0000 Subject: [PATCH] =?UTF-8?q?revert=20drill=20+=20=D1=82=D0=B0=D0=B9=D0=BC?= =?UTF-8?q?=D0=B8=D0=BD=D0=B3=D0=B8=20=D0=BF=D0=BE=20=D1=84=D0=B0=D0=BA?= =?UTF-8?q?=D1=82=D0=B8=D1=87=D0=B5=D1=81=D0=BA=D0=BE=D0=BC=D1=83=20=D1=81?= =?UTF-8?q?=D1=82=D0=B0=D1=80=D1=82=D1=83=20(2.6=D1=81,=20=D0=B0=20=D0=BD?= =?UTF-8?q?=D0=B5=2045=D1=81)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Учения раунда 2 (run 492) отработали: deploy failure (fail-fast) -> rollback success -> прод на прежнем образе. Путь отката проверен end-to-end. Возврат /app/app.jar. Тайминги: замер на проде "Started WordPdfApplication in 2.577 seconds" — start_period 45s -> 10s (podman не считает health до его истечения, он и был главной задержкой), гейты healthy 120s -> 60s, timeout up 180/120 -> 90/60 (deploy и rollback), синхронно в Containerfile, compose.yml, compose.dev.yml. --- .gitea/workflows/main.yml | 18 ++++++++++-------- Containerfile | 4 ++-- compose.dev.yml | 2 +- compose.yml | 2 +- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.gitea/workflows/main.yml b/.gitea/workflows/main.yml index 251a0e7..2019358 100644 --- a/.gitea/workflows/main.yml +++ b/.gitea/workflows/main.yml @@ -163,7 +163,9 @@ jobs: test: ["CMD-SHELL", "HTTP_PROXY= http_proxy= HTTPS_PROXY= https_proxy= wget -qO /dev/null http://127.0.0.1:8080/actuator/health || exit 1"] interval: 10s timeout: 3s - start_period: 45s + # старт приложения ~3 с (замер: "Started WordPdfApplication in 2.577s"), + # podman не считает health до истечения start_period — 10s с запасом ×3 + start_period: 10s retries: 5 environment: # ключ берётся из окружения деплоя (Gitea Secret WORDPDF_API_KEY), @@ -275,13 +277,13 @@ jobs: # timeout обязателен: podman-compose up -d бесконечно ждёт «успокоившийся» # контейнер, а crash-loop без лимита попыток не успокаивается никогда # (рег. run 488: deploy висел на этой команде, rollback не запускался). - timeout 180 podman-compose up -d --force-recreate app web - for _ in $(seq 1 60); do + timeout 90 podman-compose up -d --force-recreate app web + for _ in $(seq 1 30); do [ "$(podman inspect -f '{{.State.Health.Status}}' wordpdf-prod-app-1)" = healthy ] && break sleep 2 done [ "$(podman inspect -f '{{.State.Health.Status}}' wordpdf-prod-app-1)" = healthy ] \ - || { echo "app не стал healthy за 120с" >&2; exit 1; } + || { echo "app не стал healthy за 60с" >&2; exit 1; } # Гейт: app/web обязаны идти на только что стянутый из реестра образ # (защита от молчаливого деплоя старого кода). for svc in app web; do @@ -292,7 +294,7 @@ jobs: done # gateway пересоздаётся последним (после healthy app/web): nginx.conf # на каждый деплой рендерится заново, пересоздание применяет его. - timeout 120 podman-compose up -d --force-recreate gateway + timeout 60 podman-compose up -d --force-recreate gateway for _ in $(seq 1 10); do curl -fsS -o /dev/null "http://127.0.0.1:9010/actuator/health" 2>/dev/null && break || sleep 1 done @@ -376,14 +378,14 @@ jobs: . ./.rollback.env podman tag "$PREV_APP" "$REGISTRY/wordpdf-app:prod" podman tag "$PREV_WEB" "$REGISTRY/wordpdf-web:prod" - timeout 180 podman-compose up -d --force-recreate app web - for _ in $(seq 1 60); do + timeout 90 podman-compose up -d --force-recreate app web + for _ in $(seq 1 30); do [ "$(podman inspect -f '{{.State.Health.Status}}' wordpdf-prod-app-1)" = healthy ] && break sleep 2 done [ "$(podman inspect -f '{{.State.Health.Status}}' wordpdf-prod-app-1)" = healthy ] \ || { echo "app НЕ healthy после отката" >&2; exit 1; } - timeout 120 podman-compose up -d --force-recreate gateway + timeout 60 podman-compose up -d --force-recreate gateway curl -fsS "http://127.0.0.1:9010/actuator/health" REMOTE } | ssh "$@" "$H" bash -s diff --git a/Containerfile b/Containerfile index 5a151c2..ba45ec9 100644 --- a/Containerfile +++ b/Containerfile @@ -23,7 +23,7 @@ WORKDIR /app COPY --from=build /build/wordpdf-app/target/wordpdf-app-1.0.0.jar app.jar USER app EXPOSE 8080 -HEALTHCHECK --interval=10s --timeout=3s --start-period=45s --retries=5 \ +HEALTHCHECK --interval=10s --timeout=3s --start-period=10s --retries=5 \ CMD HTTP_PROXY= http_proxy= HTTPS_PROXY= https_proxy= wget -qO /dev/null http://127.0.0.1:8080/actuator/health || exit 1 -ENTRYPOINT ["java", "-Djava.awt.headless=true", "-jar", "/app/missing.jar"] +ENTRYPOINT ["java", "-Djava.awt.headless=true", "-jar", "/app/app.jar"] diff --git a/compose.dev.yml b/compose.dev.yml index ede7592..daeda64 100644 --- a/compose.dev.yml +++ b/compose.dev.yml @@ -19,7 +19,7 @@ services: test: ["CMD-SHELL", "HTTP_PROXY= http_proxy= HTTPS_PROXY= https_proxy= wget -qO /dev/null http://127.0.0.1:8080/actuator/health || exit 1"] interval: 10s timeout: 3s - start_period: 45s + start_period: 10s retries: 5 web: build: ./wordpdf-web diff --git a/compose.yml b/compose.yml index 02ad257..3d7080d 100644 --- a/compose.yml +++ b/compose.yml @@ -14,7 +14,7 @@ services: test: ["CMD-SHELL", "HTTP_PROXY= http_proxy= HTTPS_PROXY= https_proxy= wget -qO /dev/null http://127.0.0.1:8080/actuator/health || exit 1"] interval: 10s timeout: 3s - start_period: 45s + start_period: 10s retries: 5 environment: # без ключа стек не поднимется (:? на пустое/unset) — прод fail-closed -- 2.56.1