mirror of
https://github.com/elder-plinius/OBLITERATUS.git
synced 2026-08-30 06:30:37 +02:00
fix: gate GPU allocation on supervisor admission
This commit is contained in:
+113
-4
@@ -2,11 +2,13 @@ from __future__ import annotations
|
||||
|
||||
from datetime import datetime, timezone
|
||||
import json
|
||||
import threading
|
||||
import time
|
||||
|
||||
import pytest
|
||||
|
||||
from obliteratus.gpu_lifecycle import (
|
||||
AdmissionError,
|
||||
GpuLifecyclePublisher,
|
||||
MemoryUsage,
|
||||
measure_torch_memory,
|
||||
@@ -20,6 +22,19 @@ def test_fake_supervisor_observes_order_identity_and_recoverable_state(tmp_path)
|
||||
clock=lambda: datetime(2026, 1, 2, tzinfo=timezone.utc),
|
||||
run_id="run-1",
|
||||
)
|
||||
def acknowledge():
|
||||
while not (tmp_path / "current.json").exists():
|
||||
time.sleep(0.001)
|
||||
request = json.loads((tmp_path / "current.json").read_text())
|
||||
(tmp_path / "ack.json").write_text(json.dumps({
|
||||
"schema_version": 1,
|
||||
"run_id": "run-1",
|
||||
"request_event_id": request["event_id"],
|
||||
"decision": "grant",
|
||||
"lease_id": "lease-1",
|
||||
"granted_vram_bytes": 100,
|
||||
}))
|
||||
threading.Thread(target=acknowledge).start()
|
||||
memory = MemoryUsage(allocated_bytes=10, reserved_bytes=12, device_count=1)
|
||||
publisher.loading("org/model")
|
||||
publisher.resize(memory)
|
||||
@@ -30,12 +45,13 @@ def test_fake_supervisor_observes_order_identity_and_recoverable_state(tmp_path)
|
||||
|
||||
events = [json.loads(line) for line in (tmp_path / "events.jsonl").read_text().splitlines()]
|
||||
assert [event["event"] for event in events] == [
|
||||
"loading", "resize", "ready", "heartbeat", "release",
|
||||
"loading", "admission_granted", "allocation_started", "resize",
|
||||
"ready", "heartbeat", "release",
|
||||
]
|
||||
assert [event["sequence"] for event in events] == list(range(1, 6))
|
||||
assert len({event["event_id"] for event in events}) == 5
|
||||
assert [event["sequence"] for event in events] == list(range(1, 8))
|
||||
assert len({event["event_id"] for event in events}) == 7
|
||||
assert all(event["run_id"] == "run-1" for event in events)
|
||||
assert events[1]["reserved_vram_bytes"] == 12
|
||||
assert events[3]["reserved_vram_bytes"] == 12
|
||||
current = json.loads((tmp_path / "current.json").read_text())
|
||||
assert current["event"] == "release"
|
||||
assert current["reason"] == "test_complete"
|
||||
@@ -73,3 +89,96 @@ def test_measure_torch_memory_aggregates_devices():
|
||||
|
||||
usage = measure_torch_memory(type("Torch", (), {"cuda": FakeCuda})())
|
||||
assert usage == MemoryUsage(allocated_bytes=30, reserved_bytes=60, device_count=2)
|
||||
|
||||
|
||||
@pytest.mark.parametrize("decision", ["deny", "timeout", "stale"])
|
||||
def test_admission_failures_never_enter_allocation(tmp_path, decision):
|
||||
publisher = GpuLifecyclePublisher(
|
||||
tmp_path,
|
||||
admission_timeout_seconds=0.05,
|
||||
admission_poll_seconds=0.005,
|
||||
run_id="current-run",
|
||||
)
|
||||
allocation_entered = False
|
||||
|
||||
def acknowledge():
|
||||
nonlocal allocation_entered
|
||||
while not (tmp_path / "current.json").exists():
|
||||
time.sleep(0.001)
|
||||
request = json.loads((tmp_path / "current.json").read_text())
|
||||
if decision != "timeout":
|
||||
(tmp_path / "ack.json").write_text(json.dumps({
|
||||
"schema_version": 1,
|
||||
"run_id": "stale-run" if decision == "stale" else "current-run",
|
||||
"request_event_id": request["event_id"],
|
||||
"decision": "deny" if decision == "deny" else "grant",
|
||||
"lease_id": "lease-1",
|
||||
"granted_vram_bytes": 100,
|
||||
}))
|
||||
|
||||
worker = threading.Thread(target=acknowledge)
|
||||
worker.start()
|
||||
with pytest.raises(AdmissionError):
|
||||
publisher.loading("org/model")
|
||||
allocation_entered = True
|
||||
worker.join()
|
||||
assert allocation_entered is False
|
||||
events = [json.loads(line)["event"] for line in (tmp_path / "events.jsonl").read_text().splitlines()]
|
||||
assert "allocation_started" not in events
|
||||
|
||||
|
||||
def test_delayed_ack_blocks_until_granted(tmp_path):
|
||||
publisher = GpuLifecyclePublisher(
|
||||
tmp_path, admission_timeout_seconds=1, admission_poll_seconds=0.005, run_id="run",
|
||||
)
|
||||
entered = threading.Event()
|
||||
|
||||
def load():
|
||||
publisher.loading("model")
|
||||
entered.set()
|
||||
|
||||
worker = threading.Thread(target=load)
|
||||
worker.start()
|
||||
time.sleep(0.03)
|
||||
assert not entered.is_set()
|
||||
request = json.loads((tmp_path / "current.json").read_text())
|
||||
(tmp_path / "ack.json").write_text(json.dumps({
|
||||
"schema_version": 1, "run_id": "run", "request_event_id": request["event_id"],
|
||||
"decision": "grant", "lease_id": "lease", "granted_vram_bytes": 1,
|
||||
}))
|
||||
worker.join(timeout=1)
|
||||
assert entered.is_set()
|
||||
|
||||
|
||||
def test_grant_ceiling_and_lease_identity_fail_closed(tmp_path):
|
||||
publisher = GpuLifecyclePublisher(
|
||||
tmp_path, admission_timeout_seconds=0.2, admission_poll_seconds=0.002, run_id="run",
|
||||
)
|
||||
|
||||
def grant(request_id, lease_id="lease-a", granted=20):
|
||||
(tmp_path / "ack.json").write_text(json.dumps({
|
||||
"schema_version": 1, "run_id": "run", "request_event_id": request_id,
|
||||
"decision": "grant", "lease_id": lease_id, "granted_vram_bytes": granted,
|
||||
}))
|
||||
|
||||
def acknowledge_first():
|
||||
while not (tmp_path / "current.json").exists():
|
||||
time.sleep(0.001)
|
||||
grant(json.loads((tmp_path / "current.json").read_text())["event_id"])
|
||||
|
||||
threading.Thread(target=acknowledge_first).start()
|
||||
publisher.loading("first")
|
||||
with pytest.raises(AdmissionError, match="exceeds"):
|
||||
publisher.resize(MemoryUsage(reserved_bytes=21))
|
||||
|
||||
def acknowledge_changed_owner():
|
||||
seen = None
|
||||
while seen != "loading":
|
||||
current = json.loads((tmp_path / "current.json").read_text())
|
||||
seen = current["event"]
|
||||
time.sleep(0.001)
|
||||
grant(current["event_id"], lease_id="lease-b")
|
||||
|
||||
threading.Thread(target=acknowledge_changed_owner).start()
|
||||
with pytest.raises(AdmissionError, match="ownership changed"):
|
||||
publisher.loading("second")
|
||||
|
||||
Reference in New Issue
Block a user