Author SHA1 Message Date
Jens be0fbaa53c fix: hold candidate traffic and workers until migration commit
Managed validation / full (pull_request) Successful in 3m41s
2026-09-09 23:21:53 +02:00
10 changed files with 236 additions and 2 deletions
+24
View File
@@ -9,6 +9,30 @@ from django.shortcuts import redirect
from django.urls import reverse
from django.utils.http import url_has_allowed_host_and_scheme
from scripts.migration_worker_gate import hold_active
class MigrationMaintenanceMiddleware:
"""Block candidate traffic before durable migration activation, including GET writes."""
def __init__(self, get_response: Callable[[HttpRequest], HttpResponse]) -> None:
self.get_response = get_response
def __call__(self, request: HttpRequest) -> HttpResponse:
try:
held = hold_active()
except (OSError, RuntimeError):
held = True
health = request.method in {"GET", "HEAD"} and request.path_info in {
"/health/ready/", "/health/live/",
}
if held and not health:
response = JsonResponse({"error": "migration_maintenance"}, status=503)
response["Retry-After"] = "30"
response["Cache-Control"] = "no-store"
return response
return self.get_response(request)
class DemoReadOnlyMiddleware:
"""Prevent a shared public demo account from mutating application data."""
+1
View File
@@ -159,6 +159,7 @@ INSTALLED_APPS = [
]
MIDDLEWARE = [
"apps.core.middleware.MigrationMaintenanceMiddleware",
"django.middleware.security.SecurityMiddleware",
"whitenoise.middleware.WhiteNoiseMiddleware",
"django.contrib.sessions.middleware.SessionMiddleware",
+2 -2
View File
@@ -36,7 +36,7 @@ stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
[program:worker]
command=/app/.venv/bin/celery -A config worker -l INFO -Q high,default,low --concurrency=2
command=/app/.venv/bin/python /app/scripts/migration_worker_gate.py worker
directory=/app
user=app
priority=50
@@ -47,7 +47,7 @@ stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
[program:scheduler]
command=/app/.venv/bin/celery -A config beat -l INFO --schedule /tmp/celerybeat-schedule
command=/app/.venv/bin/python /app/scripts/migration_worker_gate.py scheduler
directory=/app
user=app
priority=60
+1
View File
@@ -4,6 +4,7 @@
name: vacatureradar-managed
services:
app:
network_mode: ${MIGRATION_NETWORK:?exact original network required}
labels:
io.itworx.migration-attempt: ${MIGRATION_ATTEMPT:?journaled migration attempt required}
image: ${MIGRATION_IMAGE:?set an attempt-specific candidate image}
+21
View File
@@ -17,3 +17,24 @@ brokerreceipt voordat de configuratie definitief wordt overgezet.
De override is offline getest met echte Compose-rendering en ontbrekende
invoervariabelen. Toevoeging van dit bestand bewijst geen uitgevoerde productiemigratie.
# Outbound worker hold
Before starting a migration candidate, create `.migration-worker-hold` in its
cloned `/app/local` directory. The supervised Celery worker and scheduler wait
without consuming tasks until the operator removes that exact attempt-owned
file after the deployment commit. Normal startup is unchanged when it is absent.
Do not put the marker into the original data. This is a startup gate, not a
control for pausing an already-running worker. Recovery before commit retains
the hold and candidate data; recovery after commit resumes activation and must
never revert to stale original data after outbound work has been released.
The first Django middleware also returns 503 (no-store) for every ordinary
request while held, including GET requests. Only exact GET/HEAD requests to
`/health/ready/` and `/health/live/` pass. Marker inspection errors fail closed.
The migration helper creates a nonce-bound marker only in the cold clone and
removes it with directory fsync after a durable `committed` journal. Recovery
after that boundary may resume activation but can never restore old data.
`MIGRATION_NETWORK` is required and must equal the inspected existing
`vacatureradar_default` network. The managed Compose project does not move the
application to a newly-created network.
+26
View File
@@ -2445,6 +2445,32 @@ tasks:
note: Releasebootstrap gepind op immutable setup-uv v8.1.0-commit en uv 0.11.12 via Astral-mirror; Gitea Actions-run
3062 publiceerde digest sha256:98f4b33d met checksum-geldige SBOM/release-evidence; Unraid gepind op volledige
digest en live health/readiness groen.
- id: VR-232
title: Houd uitgaand werk vast tijdens gecontroleerde datamigratie
status: ready
priority: P0
requirement_ids: [NFR-009]
depends_on: [VR-231]
summary: Door de eigenaar gevraagde migratie met rollback; Celery start pas na vrijgave van de kandidaatkopie.
acceptance_criteria:
- Een marker in de kandidaatkopie blokkeert worker en scheduler voor hun eerste externe actie.
- Zonder marker blijft normaal opstartgedrag ongewijzigd.
- Onbekende procesrollen en ongeldige markers falen gesloten.
- De migratie verwijdert uitsluitend haar eigen marker na geverifieerde commit.
- Gewone webverzoeken blijven geblokkeerd tot commit; alleen exacte GET/HEAD-healthroutes zijn beschikbaar.
- De migratie behoudt het bestaande Docker-netwerk via een verplichte gevalideerde variabele.
verification:
- uv run pytest tests/unit/test_migration_worker_gate.py
- uv run pytest tests/unit/test_migration_maintenance.py
- ./scripts/codex_verify.sh
primary_paths:
- scripts/migration_worker_gate.py
- deployment/unraid/supervisord.conf
- tests/unit/test_migration_worker_gate.py
- tests/unit/test_migration_maintenance.py
- apps/core/middleware.py
- config/settings.py
- docker-compose.migration.yml
- id: VR-231
title: Sluit de operationele 0.3.17-restpunten
status: done
+12
View File
@@ -1,5 +1,17 @@
# Projectstatus
## Gecontroleerde migratie — 2026-09-09
VR-232 voegt een startup-hold voor Celery worker/beat toe tijdens de expliciet
goedgekeurde legacy-migratie. Alleen de kandidaatdatakopie krijgt een marker;
uitgaand werk wordt pas na een geverifieerde deploymentcommit vrijgegeven.
De eerste middleware blokkeert ook gewone webverzoeken tot commit; alleen exacte
GET/HEAD-healthroutes blijven beschikbaar. De netwerkoverride behoudt het bestaande
netwerk. Lokaal slagen 344 tests inclusief browsercontroles (84,07% coverage).
De volledige `scripts/codex_verify.sh`-gate is groen: Ruff, Django-checks,
migratiecontrole, tests, taakledger en repositoryvalidatie zijn geslaagd.
Live migratie is niet uitgevoerd. Bestaande productietaken zijn niet gewijzigd.
- Laatst bijgewerkt: 2026-08-12
- Repositoryversie: 0.3.17 immutable releaseherstel
- Uitvoeringsmodus: autonome backlog
+60
View File
@@ -0,0 +1,60 @@
"""Keep outbound Celery work paused during a verified cold-data migration.
The operator creates the hold file in the candidate data clone before startup
and removes it only after committing the verified deployment. Normal startups
without a hold file behave unchanged. This does not pause an existing worker.
"""
import os
import stat
import sys
import time
from pathlib import Path
HOLD_FILE = Path("/app/local/.migration-worker-hold")
COMMANDS = {
"worker": [
"/app/.venv/bin/celery",
"-A",
"config",
"worker",
"-l",
"INFO",
"-Q",
"high,default,low",
"--concurrency=2",
],
"scheduler": [
"/app/.venv/bin/celery",
"-A",
"config",
"beat",
"-l",
"INFO",
"--schedule",
"/tmp/celerybeat-schedule", # noqa: S108 - existing supervised container-local schedule path
],
}
def hold_active(path=HOLD_FILE):
try:
mode = path.lstat().st_mode
except FileNotFoundError:
return False
if not stat.S_ISREG(mode):
raise RuntimeError("Migration hold must be a regular file")
return True
def start(role, *, check=hold_active, sleep=time.sleep, execute=os.execv):
if role not in COMMANDS:
raise ValueError("Unsupported supervised process")
while check():
sleep(1)
command = COMMANDS[role]
execute(command[0], command)
if __name__ == "__main__":
start(sys.argv[1] if len(sys.argv) == 2 else "")
+45
View File
@@ -0,0 +1,45 @@
from unittest.mock import Mock, patch
import pytest
from django.http import HttpResponse
from django.test import RequestFactory
from apps.core.middleware import MigrationMaintenanceMiddleware
@pytest.mark.parametrize("method,path,allowed", [
("GET", "/health/ready/", True),
("HEAD", "/health/live/", True),
("POST", "/health/ready/", False),
("GET", "/health/ready", False),
("GET", "/", False),
("POST", "/accounts/login/", False),
("OPTIONS", "/health/live/", False),
])
def test_held_candidate_only_allows_exact_safe_health(method, path, allowed):
downstream = Mock(return_value=HttpResponse("ok"))
with patch("apps.core.middleware.hold_active", return_value=True):
response = MigrationMaintenanceMiddleware(downstream)(
RequestFactory().generic(method, path)
)
assert response.status_code == (200 if allowed else 503)
assert downstream.called is allowed
if not allowed:
assert response["Cache-Control"] == "no-store"
@pytest.mark.parametrize("failure", [PermissionError(), RuntimeError()])
def test_marker_errors_block_ordinary_traffic(failure):
downstream = Mock()
with patch("apps.core.middleware.hold_active", side_effect=failure):
response = MigrationMaintenanceMiddleware(downstream)(RequestFactory().get("/"))
assert response.status_code == 503
downstream.assert_not_called()
def test_normal_runtime_unchanged_and_middleware_is_first(settings):
assert settings.MIDDLEWARE[0] == "apps.core.middleware.MigrationMaintenanceMiddleware"
downstream = Mock(return_value=HttpResponse("ok"))
with patch("apps.core.middleware.hold_active", return_value=False):
response = MigrationMaintenanceMiddleware(downstream)(RequestFactory().post("/"))
assert response.status_code == 200
+44
View File
@@ -0,0 +1,44 @@
import importlib.util
from pathlib import Path
import pytest
spec = importlib.util.spec_from_file_location(
"migration_worker_gate",
Path(__file__).resolve().parents[2] / "scripts/migration_worker_gate.py",
)
gate = importlib.util.module_from_spec(spec)
spec.loader.exec_module(gate)
@pytest.mark.parametrize("role", ["worker", "scheduler"])
def test_hold_prevents_outbound_process_until_release(role):
states = iter([True, True, False])
events = []
gate.start(
role,
check=lambda: next(states),
sleep=lambda seconds: events.append("wait"),
execute=lambda executable, args: events.append(args),
)
assert events == ["wait", "wait", gate.COMMANDS[role]]
def test_normal_startup_and_missing_hold(tmp_path):
assert not gate.hold_active(tmp_path / "absent")
events = []
gate.start("worker", check=lambda: False, execute=lambda executable, args: events.append(args))
assert events == [gate.COMMANDS["worker"]]
def test_hold_exists_and_unsupported_marker_fails_closed(tmp_path):
marker = tmp_path / "hold"
marker.write_text("fixture-attempt")
assert gate.hold_active(marker)
with pytest.raises(RuntimeError):
gate.hold_active(tmp_path)
def test_unknown_role_never_executes():
with pytest.raises(ValueError):
gate.start("shell", execute=lambda *args: pytest.fail("unreviewed command"))