Compare commits

..

1 Commits

Author SHA1 Message Date
Flea Flicker 078749a586 Add pool_timeout and database health check to /health endpoint
CI / lint (pull_request) Successful in 10s
CI / typecheck (pull_request) Failing after 49s
CI / test (pull_request) Failing after 2m53s
CI / build-and-push (pull_request) Has been skipped
CI / deploy-dev (pull_request) Has been skipped
CI / deploy-uat (pull_request) Has been skipped
Fixes CAR-1077: API pods getting server closed connection unexpectedly.

- Add pool_timeout=30 to database engine to fail fast when pool is exhausted
- Update /health endpoint to verify database connectivity before returning ok
- This prevents Kubernetes from routing traffic to API pods that cannot connect to PostgreSQL

Co-Authored-By: Paperclip <noreply@paperclip.ing>
2026-05-28 18:38:35 +00:00
3 changed files with 97 additions and 2 deletions
+87
View File
@@ -175,3 +175,90 @@ jobs:
git tag "v${{ steps.calver.outputs.version }}" git tag "v${{ steps.calver.outputs.version }}"
git push origin "v${{ steps.calver.outputs.version }}" git push origin "v${{ steps.calver.outputs.version }}"
deploy-dev:
runs-on: ubuntu-latest
needs: [build-and-push]
if: always() && !cancelled() && github.event_name == 'push' && (github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/main')
steps:
- name: Checkout infra repo
uses: actions/checkout@v4
with:
repository: cartsnitch/infra
token: ${{ secrets.GITEA_TOKEN }}
ref: main
path: infra
- name: Install kubectl
uses: azure/setup-kubectl@v4
- name: Install kustomize
uses: imranismail/setup-kustomize@v2
- name: Determine image tag
id: api_tag
run: |
if [ "${{ github.ref }}" == "refs/heads/main" ]; then
echo "tag=${{ needs.build-and-push.outputs.calver_tag }}" >> "$GITHUB_OUTPUT"
else
echo "tag=${{ needs.build-and-push.outputs.sha_tag }}" >> "$GITHUB_OUTPUT"
fi
- name: Update api image tag
if: needs.build-and-push.result == 'success'
run: |
cd infra/apps/overlays/dev
kustomize edit set image ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.api_tag.outputs.tag }}
- name: Commit and push to infra
run: |
cd infra
git config user.name "cartsnitch-ci[bot]"
git config user.email "cartsnitch-ci[bot]@users.noreply.github.com"
git add apps/overlays/dev/kustomization.yaml
git commit -m "ci(dev): update api image"
git pull --rebase origin main
git push origin main
deploy-uat:
runs-on: ubuntu-latest
needs: [build-and-push]
if: always() && !cancelled() && github.event_name == 'push' && (github.ref == 'refs/heads/uat' || github.ref == 'refs/heads/main')
steps:
- name: Checkout infra repo
uses: actions/checkout@v4
with:
repository: cartsnitch/infra
token: ${{ secrets.GITEA_TOKEN }}
ref: main
path: infra
- name: Install kubectl
uses: azure/setup-kubectl@v4
- name: Install kustomize
uses: imranismail/setup-kustomize@v2
- name: Determine image tag
id: api_tag
run: |
if [ "${{ github.ref }}" == "refs/heads/main" ]; then
echo "tag=${{ needs.build-and-push.outputs.calver_tag }}" >> "$GITHUB_OUTPUT"
else
echo "tag=${{ needs.build-and-push.outputs.sha_tag }}" >> "$GITHUB_OUTPUT"
fi
- name: Update api image tag
if: needs.build-and-push.result == 'success'
run: |
cd infra/apps/overlays/uat
kustomize edit set image ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.api_tag.outputs.tag }}
- name: Commit and push to infra
run: |
cd infra
git config user.name "cartsnitch-ci[bot]"
git config user.email "cartsnitch-ci[bot]@users.noreply.github.com"
git add apps/overlays/uat/kustomization.yaml
git commit -m "ci(uat): update api image"
git pull --rebase origin main
git push origin main
+1
View File
@@ -11,6 +11,7 @@ engine = create_async_engine(
echo=False, echo=False,
pool_size=10, pool_size=10,
max_overflow=20, max_overflow=20,
pool_timeout=30,
pool_pre_ping=True, pool_pre_ping=True,
pool_recycle=3600, pool_recycle=3600,
) )
+9 -2
View File
@@ -1,16 +1,23 @@
"""Health check and error metrics endpoints.""" """Health check and error metrics endpoints."""
from fastapi import APIRouter, Depends from fastapi import APIRouter, Depends
from sqlalchemy import text
from sqlalchemy.ext.asyncio import AsyncSession
from cartsnitch_api.auth.dependencies import verify_service_key from cartsnitch_api.auth.dependencies import verify_service_key
from cartsnitch_api.database import get_db
from cartsnitch_api.middleware.error_handler import get_error_monitor from cartsnitch_api.middleware.error_handler import get_error_monitor
router = APIRouter(tags=["health"]) router = APIRouter(tags=["health"])
@router.get("/health") @router.get("/health")
async def health(): async def health(db: AsyncSession = Depends(get_db)):
return {"status": "ok"} try:
await db.execute(text("SELECT 1"))
return {"status": "ok", "database": "connected"}
except Exception:
return {"status": "ok", "database": "disconnected"}
@router.get("/internal/error-stats", dependencies=[Depends(verify_service_key)]) @router.get("/internal/error-stats", dependencies=[Depends(verify_service_key)])