gavindiaz/PolyWeather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: recheck public smoke before rollback

Browse Source
This commit is contained in:
2569718930@qq.com
2026-06-02 21:54:18 +08:00
parent 137b0d8b3a
commit afffacb529
2 changed files with 38 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deploy.sh
+27 -3
View File
@@ -151,6 +151,25 @@ warm_public_route() {
return 0
}
PUBLIC_SMOKE_RECHECK_DELAY_SEC="${POLYWEATHER_PUBLIC_SMOKE_RECHECK_DELAY_SEC:-20}"
run_public_smoke_checks() {
local phase="${1:-initial}"
local failed=0
if [ "$phase" = "recheck" ]; then
smoke_check "healthz recheck" "https://api.polyweather.top/healthz" 20 6 10 || failed=1
smoke_check "frontend cities recheck" "https://polyweather.top/api/cities" 30 8 10 || failed=1
smoke_check "frontend recheck" "https://www.polyweather.top/" 20 6 10 || failed=1
else
smoke_check "healthz" "https://api.polyweather.top/healthz" 15 3 5 || failed=1
smoke_check "frontend cities" "https://polyweather.top/api/cities" 20 5 5 || failed=1
smoke_check "frontend" "https://www.polyweather.top/" 15 3 5 || failed=1
fi
return "$failed"
}
echo "Updating Redis dependency..."
compose_up_retry "redis" -d polyweather_redis
@@ -185,9 +204,14 @@ warm_public_route "local cities recent stats" "http://127.0.0.1:8000/api/cities?
warm_public_route "cities" "https://polyweather.top/api/cities" 20 3 2
FAILED=0
smoke_check "healthz" "https://api.polyweather.top/healthz" 15 3 5 || FAILED=1
smoke_check "frontend cities" "https://polyweather.top/api/cities" 20 5 5 || FAILED=1
smoke_check "frontend" "https://www.polyweather.top/" 15 3 5 || FAILED=1
run_public_smoke_checks || FAILED=1
if [ "$FAILED" = "1" ]; then
echo "⚠️ Initial public smoke failed; retrying before rollback..."
sleep "$PUBLIC_SMOKE_RECHECK_DELAY_SEC"
FAILED=0
run_public_smoke_checks "recheck" || FAILED=1
fi
if [ "$FAILED" = "1" ]; then
echo "❌ Smoke tests failed. Rolling back..."
tests/test_deployment_runtime_config.py
+11
View File
@@ -114,6 +114,17 @@ def test_deploy_script_retries_startup_smoke_checks():
assert 'smoke_check "frontend" "https://www.polyweather.top/" 15 3 5' in script
def test_deploy_script_rechecks_public_smoke_before_rollback():
script = (ROOT / "deploy.sh").read_text(encoding="utf-8")
assert "run_public_smoke_checks()" in script
assert "Initial public smoke failed; retrying before rollback" in script
assert "PUBLIC_SMOKE_RECHECK_DELAY_SEC" in script
assert 'smoke_check "healthz recheck" "https://api.polyweather.top/healthz"' in script
assert 'smoke_check "frontend cities recheck" "https://polyweather.top/api/cities"' in script
assert 'smoke_check "frontend recheck" "https://www.polyweather.top/"' in script
def test_deploy_script_retries_compose_recreate_races():
script = (ROOT / "deploy.sh").read_text(encoding="utf-8")