mirror of
https://github.com/nomadkaraoke/karaoke-gen.git
synced 2026-11-20 13:07:57 +09:00
## Summary Found by the prod E2E on 2026-10-31. - With `aws_video_worker` on, the render worker dispatched the video worker to AWS, and it parked waiting for stems. - The **stems-ready resume** came from `audio-separation-job`, which has no `ENCODING_WORKER_FALLBACK_VMS` env. It never saw the AWS worker, so it silently started the Cloud Run job. - The job completed fine, because the Cloud Run job is the fallback, but its distribution ran from GCP. ## Changes - `EncodingWorkerManager.fallback_entries()`: in production, when the env var is missing, read the `encoding-worker-fallback-vms` secret (cached per process by `get_secret`). This affects the audio, lyrics and download jobs, which also trigger and warm the encoder. Outside production it never fetches. - `_trigger_video_worker_on_aws`: logs when the AWS dispatch is skipped because AWS isn't the top-ranked worker, so it can't fail silently again. ## Testing - 3 new tests: secret fallback in prod, no fetch outside prod, env preferred over the secret. All 171 related tests pass. - Local CodeRabbit: no findings. - After deploy: another prod E2E to confirm the resume reaches AWS. @coderabbitai ignore 🤖 Generated with [Claude Code](https://claude.com/claude-code) https://claude.ai/code/session_012RYLVSR5qgwsxTQtvGimKF Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
189 lines
7.5 KiB
Python
189 lines
7.5 KiB
Python
"""EncodingWorkerManager with the AWS encoding worker in the pool.
|
|
|
|
Covers routing AWS VMs to the EC2 adapter (GCE untouched), the shared fallback
|
|
parser passing provider fields through, ranking with Firestore
|
|
speed_rank_overrides, the ranked warmup, and the override's provider tag.
|
|
"""
|
|
import json
|
|
from unittest.mock import MagicMock
|
|
|
|
import pytest
|
|
|
|
from backend.services.aws_encoding_compute import AwsStartOperation
|
|
from backend.services.encoding_errors import EncodingWorkerCapacityError
|
|
from backend.services.encoding_worker_manager import EncodingWorkerManager, parse_fallback_vms
|
|
|
|
AWS_ENTRY = {
|
|
"vm": "aws-encoding-worker-1", "zone": "us-east-2b", "ip": "3.3.3.3",
|
|
"machine_type": "c7a-8xlarge", "provider": "aws", "instance_id": "i-0abc", "region": "us-east-2",
|
|
}
|
|
C2D_ENTRY = {"vm": "encoding-worker-fallback-c2df", "zone": "us-central1-f", "ip": "2.2.2.2",
|
|
"machine_type": "c2d-highcpu-16"}
|
|
|
|
|
|
def _db(**config):
|
|
data = {
|
|
"primary_vm": "encoding-worker-a", "primary_ip": "1.1.1.1", "primary_version": "1.0",
|
|
"secondary_vm": "encoding-worker-b", "secondary_ip": "1.1.1.2",
|
|
"last_activity_at": None, "capacity_state": {}, **config,
|
|
}
|
|
db = MagicMock()
|
|
snap = MagicMock(exists=True)
|
|
snap.to_dict.return_value = data
|
|
doc = MagicMock()
|
|
doc.get.return_value = snap
|
|
db.collection.return_value.document.return_value = doc
|
|
return db, doc
|
|
|
|
|
|
def _manager(db, aws=None, entries=(C2D_ENTRY, AWS_ENTRY)):
|
|
gce = MagicMock(name="gce")
|
|
aws = aws or MagicMock(name="aws")
|
|
aws.handles.side_effect = lambda vm: vm == AWS_ENTRY["vm"]
|
|
m = EncodingWorkerManager(db=db, compute_client=gce, fallback_vms_raw=json.dumps(list(entries)), aws_compute=aws)
|
|
return m, gce, aws
|
|
|
|
|
|
def test_parse_fallback_vms_passes_aws_fields_through():
|
|
parsed = parse_fallback_vms(json.dumps([C2D_ENTRY, AWS_ENTRY]))
|
|
assert parsed[0] == {**C2D_ENTRY, "kind": "fallback"}
|
|
assert parsed[1]["provider"] == "aws"
|
|
assert parsed[1]["instance_id"] == "i-0abc" and parsed[1]["region"] == "us-east-2"
|
|
|
|
|
|
@pytest.mark.parametrize("raw", [None, "", "not json", "{}", "null"])
|
|
def test_parse_fallback_vms_never_raises(raw):
|
|
assert parse_fallback_vms(raw) == []
|
|
|
|
|
|
def test_aws_vm_ops_go_to_adapter_and_gce_untouched():
|
|
db, _ = _db()
|
|
m, gce, aws = _manager(db)
|
|
aws.get.return_value = MagicMock(status="RUNNING")
|
|
gce.get.return_value = MagicMock(status="TERMINATED")
|
|
|
|
assert m.get_vm_status("aws-encoding-worker-1", zone="us-east-2b") == "RUNNING"
|
|
assert m.get_vm_status("encoding-worker-a") == "TERMINATED"
|
|
aws.get.assert_called_once()
|
|
gce.get.assert_called_once()
|
|
|
|
|
|
def test_aws_capacity_error_raises_typed_capacity_error():
|
|
db, _ = _db()
|
|
m, _, aws = _manager(db)
|
|
aws.get.return_value = MagicMock(status="TERMINATED")
|
|
|
|
def _no_capacity():
|
|
from botocore.exceptions import ClientError
|
|
raise ClientError({"Error": {"Code": "InsufficientInstanceCapacity", "Message": "none"}}, "StartInstances")
|
|
|
|
aws.start.return_value = AwsStartOperation(_no_capacity)
|
|
with pytest.raises(EncodingWorkerCapacityError):
|
|
m.start_vm("aws-encoding-worker-1", zone="us-east-2b")
|
|
|
|
|
|
def test_ranked_candidates_default_keeps_gce_primary_first_and_aws_last():
|
|
db, _ = _db()
|
|
m, _, _ = _manager(db)
|
|
ranked = m.ranked_candidates()
|
|
assert [c.vm_name for c in ranked] == ["encoding-worker-a", "encoding-worker-fallback-c2df", "aws-encoding-worker-1"]
|
|
assert ranked[0].is_primary and ranked[-1].provider == "aws"
|
|
|
|
|
|
def test_ranked_candidates_honour_speed_rank_overrides():
|
|
db, _ = _db(speed_rank_overrides={"c7a": 5})
|
|
m, _, _ = _manager(db)
|
|
assert m.ranked_candidates()[0].vm_name == "aws-encoding-worker-1"
|
|
|
|
|
|
def test_ensure_preferred_running_is_primary_path_when_primary_ranks_first():
|
|
db, _ = _db()
|
|
m, _, _ = _manager(db)
|
|
m.ensure_primary_running = MagicMock(return_value={"started": False})
|
|
m.ensure_any_running = MagicMock()
|
|
m.ensure_preferred_running()
|
|
m.ensure_primary_running.assert_called_once()
|
|
m.ensure_any_running.assert_not_called()
|
|
|
|
|
|
def test_ensure_preferred_running_starts_aws_when_preferred():
|
|
db, _ = _db(speed_rank_overrides={"c7a": 5})
|
|
m, _, _ = _manager(db)
|
|
m.ensure_primary_running = MagicMock()
|
|
m.ensure_any_running = MagicMock(return_value={"started": True, "vm_name": "aws-encoding-worker-1"})
|
|
m.ensure_preferred_running()
|
|
m.ensure_primary_running.assert_not_called()
|
|
(candidates,), _ = m.ensure_any_running.call_args
|
|
assert candidates[0].vm_name == "aws-encoding-worker-1"
|
|
|
|
|
|
def test_active_override_records_provider():
|
|
db, doc = _db()
|
|
m, _, _ = _manager(db)
|
|
aws_candidate = next(c for c in m.ranked_candidates() if c.provider == "aws")
|
|
m._set_active_override(aws_candidate)
|
|
update = doc.update.call_args[0][0]
|
|
assert update["active_override_vm"] == "aws-encoding-worker-1"
|
|
assert update["active_override_provider"] == "aws"
|
|
|
|
db2, doc2 = _db(active_override_vm="aws-encoding-worker-1", active_override_provider="aws")
|
|
m2, _, _ = _manager(db2)
|
|
m2._clear_active_override()
|
|
assert doc2.update.call_args[0][0]["active_override_provider"] is None
|
|
|
|
|
|
def test_aws_control_plane_fault_fails_over_to_gce():
|
|
db, _ = _db(speed_rank_overrides={"c7a": 5})
|
|
m, gce, aws = _manager(db, entries=(AWS_ENTRY,))
|
|
aws.get.side_effect = RuntimeError("could not load aws-encoding-controller-credentials")
|
|
gce.get.return_value = MagicMock(status="RUNNING")
|
|
m.update_activity = MagicMock()
|
|
m._clear_active_override = MagicMock()
|
|
m._clear_stockout = MagicMock()
|
|
|
|
result = m.ensure_any_running(m.ranked_candidates())
|
|
|
|
assert result["vm_name"] == "encoding-worker-a"
|
|
|
|
|
|
def _settings(env_value, secret_value):
|
|
s = MagicMock()
|
|
s.encoding_worker_fallback_vms = env_value
|
|
s.get_secret = MagicMock(return_value=secret_value)
|
|
return s
|
|
|
|
|
|
def test_fallback_entries_read_secret_in_prod_when_env_missing(monkeypatch):
|
|
"""Jobs without the env var (audio/lyrics/download) still see the AWS worker:
|
|
they trigger the video worker after stems, so they must rank identically."""
|
|
from unittest.mock import patch
|
|
db, _ = _db()
|
|
m = EncodingWorkerManager(db=db, compute_client=MagicMock(), aws_compute=MagicMock())
|
|
settings = _settings(None, json.dumps([AWS_ENTRY]))
|
|
with patch("backend.config.get_settings", return_value=settings), \
|
|
patch("backend.config.is_production", return_value=True):
|
|
assert [e["vm"] for e in m.fallback_entries()] == ["aws-encoding-worker-1"]
|
|
settings.get_secret.assert_called_once_with("encoding-worker-fallback-vms")
|
|
|
|
|
|
def test_fallback_entries_never_fetch_secret_outside_prod():
|
|
from unittest.mock import patch
|
|
db, _ = _db()
|
|
m = EncodingWorkerManager(db=db, compute_client=MagicMock(), aws_compute=MagicMock())
|
|
settings = _settings(None, json.dumps([AWS_ENTRY]))
|
|
with patch("backend.config.get_settings", return_value=settings), \
|
|
patch("backend.config.is_production", return_value=False):
|
|
assert m.fallback_entries() == []
|
|
settings.get_secret.assert_not_called()
|
|
|
|
|
|
def test_fallback_entries_prefer_env_over_secret():
|
|
from unittest.mock import patch
|
|
db, _ = _db()
|
|
m = EncodingWorkerManager(db=db, compute_client=MagicMock(), aws_compute=MagicMock())
|
|
settings = _settings(json.dumps([C2D_ENTRY]), json.dumps([AWS_ENTRY]))
|
|
with patch("backend.config.get_settings", return_value=settings), \
|
|
patch("backend.config.is_production", return_value=True):
|
|
assert [e["vm"] for e in m.fallback_entries()] == ["encoding-worker-fallback-c2df"]
|
|
settings.get_secret.assert_not_called()
|