mirror of
https://github.com/BerriAI/litellm.git
synced 2026-10-14 04:09:09 +00:00
* test(integration): give chaos and timing tests a harness API and gate raw signals Chaos tests killed and suspended proxy workers with raw os.kill and psutil calls and bounded elapsed time with fixed literals, so they raced the uvicorn worker healthcheck and failed on slow CI boxes OwnedProxy now offers kill_worker and replacing_worker, which return only once a replacement answers readiness with its own pid, and suspended, which is refused unless the proxy was launched with a lenient worker healthcheck. timing.py bounds durations against a measured control or the injected delay. run.py measures the proxy import time once and derives readiness deadlines and the per-test timeout from it, writing boot-calibration.json check_test_quality.py adds TQ010 (raw process signals) and TQ011 (elapsed time asserted under a numeric literal) for tests/integration outside _support, and every call site is migrated so both report zero with no suppressions * test(integration): steer the assistants wire burst onto both workers The mixed-status burst assumed the OS would spread 48 connections across both workers and failed when one worker took them all. Each half is now sent while the other worker is suspended, and the test asserts an exact 24 and 24 split * test(integration): restore product-enforced timing bounds lost in the migration Some TQ011 migrations dropped or loosened a bound whose time is the behaviour under test. The websocket session cap only kept its floor, so a cap closing at 300 s would have passed, and several timeouts were bounded by the injected stall instead of the configured product value assert_enforced_within bounds an elapsed time by the configured value plus explicit slack, with an optional floor. The websocket cap, the MCP validation timeout, the guardrail litellm_params timeout, the prisma command timeouts, the baseline projection lock timeout and the key metadata statement timeout use it. The device code refusal keeps its 15 s margin, and the langfuse retried prompt fetch is now bounded by a cold fetch of a steady prompt as well as by the ignored retry-after * fix(tests): wait for the supervisor to reap killed workers and fix real-kill migrations The lenient worker healthcheck was the whole case budget, so uvicorn's supervisor sat in a ping on the killed worker for up to that long before respawning it. It now uses the graceful stop budget, and a worker kill returns only after the victim is reaped, so pooled connections no longer race the dead worker's socket. Several tests on main picked the multiprocessing resource tracker as their victim and never killed a worker. Now that they kill a real one, presidio counts streams cut by the death, delete_model waits for the config reload that removes a deleted model from a replacement worker, and the wedged coordination Redis test kills before the wedge and waits for every parked publish to fail before resuming Redis. The redis cluster test imports the harness through the tests package so it collects in the unit job, and the per-model fallback rig exposes the owned proxy it now needs. * test(observability): only require S3 deliveries the killed worker could not have buffered A real SIGKILL drops the victim's unflushed batch, so requests it already answered can't be expected to land. The test now requires every request served after the replacement to land, some of the surviving worker's burst share to land, and nothing unsent to land --------- Co-authored-by: Yuneng Jiang <yuneng@berri.ai>
224 lines
8 KiB
Python
224 lines
8 KiB
Python
import os
|
|
import shutil
|
|
import signal
|
|
import socket
|
|
import subprocess
|
|
import time
|
|
import uuid
|
|
from collections.abc import Callable, Iterator
|
|
from contextlib import contextmanager
|
|
from dataclasses import dataclass
|
|
from pathlib import Path
|
|
from typing import Final, TextIO
|
|
|
|
from redis import Redis
|
|
from redis.exceptions import ConnectionError as RedisConnectionError
|
|
|
|
PORT_ATTEMPTS: Final = 5
|
|
|
|
|
|
@dataclass(frozen=True, slots=True)
|
|
class PortUnavailable:
|
|
reason: str
|
|
|
|
|
|
def free_loopback_port() -> int:
|
|
with socket.socket() as reservation:
|
|
reservation.bind(("127.0.0.1", 0))
|
|
return reservation.getsockname()[1]
|
|
|
|
|
|
@dataclass
|
|
class OwnedRedis:
|
|
host: str
|
|
port: int
|
|
command: tuple[str, ...]
|
|
log: TextIO
|
|
pid_file: str
|
|
process: subprocess.Popen | None = None
|
|
server_pid: int | None = None
|
|
|
|
def serves(self) -> bool:
|
|
with Redis(host=self.host, port=self.port, socket_connect_timeout=0.2, socket_timeout=0.2) as client:
|
|
try:
|
|
return bool(client.ping())
|
|
except RedisConnectionError:
|
|
return False
|
|
|
|
def owned_pid(self) -> int | None:
|
|
assert self.process is not None
|
|
if self.command[0] != "docker":
|
|
return self.process.pid
|
|
result: Final = subprocess.run(
|
|
["docker", "exec", "redis-cache", "cat", self.pid_file],
|
|
capture_output=True,
|
|
text=True,
|
|
timeout=2,
|
|
)
|
|
if result.returncode != 0:
|
|
return None
|
|
return int(result.stdout)
|
|
|
|
def start(self) -> None:
|
|
unavailable: Final = self.try_start()
|
|
assert unavailable is None, unavailable.reason
|
|
|
|
def try_start(self) -> PortUnavailable | None:
|
|
assert self.process is None
|
|
if self.serves():
|
|
return PortUnavailable(f"Another Redis already serves {self.host}:{self.port} before the owned one starts")
|
|
process: Final = subprocess.Popen(
|
|
self.command, stdout=self.log, stderr=subprocess.STDOUT, start_new_session=True
|
|
)
|
|
self.process = process
|
|
deadline: Final = time.monotonic() + 8
|
|
with Redis(host=self.host, port=self.port, socket_connect_timeout=0.2, socket_timeout=0.2) as client:
|
|
while True:
|
|
code: Final = process.poll()
|
|
if code is not None:
|
|
self.process = None
|
|
return PortUnavailable(
|
|
f"Owned Redis exited with code {code} before readiness on {self.host}:{self.port}"
|
|
)
|
|
try:
|
|
if client.ping():
|
|
actual: Final = int(client.info("server")["process_id"])
|
|
expected: Final = self.owned_pid()
|
|
if actual == expected:
|
|
self.server_pid = actual
|
|
return None
|
|
try:
|
|
process.wait(timeout=max(deadline - time.monotonic(), 0))
|
|
except subprocess.TimeoutExpired as error:
|
|
raise AssertionError("Redis readiness reached a different process") from error
|
|
self.process = None
|
|
return PortUnavailable(f"A different Redis answered on {self.host}:{self.port} during startup")
|
|
except RedisConnectionError:
|
|
pass
|
|
assert time.monotonic() < deadline, "Owned Redis readiness deadline exceeded"
|
|
time.sleep(0.05)
|
|
|
|
def stop(self) -> None:
|
|
assert self.process is not None
|
|
failure = None
|
|
forced = False
|
|
try:
|
|
if self.process.poll() is None:
|
|
with Redis(host=self.host, port=self.port, socket_connect_timeout=1, socket_timeout=1) as client:
|
|
assert int(client.info("server")["process_id"]) == self.server_pid, (
|
|
"Redis ownership changed before shutdown"
|
|
)
|
|
client.shutdown(nosave=True)
|
|
except Exception as error:
|
|
failure = error
|
|
finally:
|
|
try:
|
|
self.process.wait(timeout=5)
|
|
except subprocess.TimeoutExpired:
|
|
forced = True
|
|
self.signal(signal.SIGTERM)
|
|
try:
|
|
self.process.wait(timeout=5)
|
|
except subprocess.TimeoutExpired:
|
|
self.signal(signal.SIGKILL)
|
|
self.process.wait(timeout=3)
|
|
self.process = None
|
|
self.server_pid = None
|
|
assert not self.serves(), "Owned Redis still serves after shutdown"
|
|
assert failure is None and not forced, f"Owned Redis required shutdown recovery: {failure!r}"
|
|
|
|
def signal(self, action: signal.Signals) -> None:
|
|
assert self.process is not None
|
|
if self.command[0] != "docker":
|
|
self.process.send_signal(action)
|
|
return
|
|
pid: Final = int(subprocess.check_output(["docker", "exec", "redis-cache", "cat", self.pid_file], timeout=2))
|
|
command: Final = subprocess.check_output(
|
|
["docker", "exec", "redis-cache", "cat", f"/proc/{pid}/cmdline"], timeout=2
|
|
)
|
|
assert self.pid_file.encode() in command, "Redis process ownership changed"
|
|
subprocess.run(["docker", "exec", "redis-cache", "kill", f"-{int(action)}", str(pid)], check=True, timeout=2)
|
|
|
|
@contextmanager
|
|
def paused(self) -> Iterator[None]:
|
|
self.signal(signal.SIGSTOP)
|
|
try:
|
|
yield
|
|
finally:
|
|
self.signal(signal.SIGCONT)
|
|
|
|
|
|
@contextmanager
|
|
def _started(
|
|
build: Callable[[int], OwnedRedis],
|
|
choose_port: Callable[[], int],
|
|
attempts: int,
|
|
log_name: str,
|
|
) -> Iterator[OwnedRedis]:
|
|
server: Final = build(choose_port())
|
|
try:
|
|
unavailable: Final = server.try_start()
|
|
if unavailable is None:
|
|
yield server
|
|
return
|
|
assert attempts > 1, (
|
|
f"Owned Redis found no usable port after {PORT_ATTEMPTS} attempts: {unavailable.reason} (log {log_name})"
|
|
)
|
|
with _started(build, choose_port, attempts - 1, log_name) as started:
|
|
yield started
|
|
finally:
|
|
if server.process is not None:
|
|
server.stop()
|
|
|
|
|
|
@contextmanager
|
|
def owned_redis(directory: Path, choose_port: Callable[[], int] = free_loopback_port) -> Iterator[OwnedRedis]:
|
|
binary: Final = shutil.which("redis-server")
|
|
if binary:
|
|
host: Final = "127.0.0.1"
|
|
prefix: Final = (binary,)
|
|
else:
|
|
host: Final = subprocess.check_output(
|
|
[
|
|
"docker",
|
|
"inspect",
|
|
"--format",
|
|
"{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}",
|
|
"redis-cache",
|
|
],
|
|
text=True,
|
|
).strip()
|
|
assert host, "CircleCI owned Redis container has no address"
|
|
prefix: Final = ("docker", "exec", "redis-cache", "redis-server")
|
|
output: Final = Path(os.environ.get("INTEGRATION_RESULTS_DIR", str(directory)))
|
|
output.mkdir(parents=True, exist_ok=True)
|
|
directory.mkdir(parents=True, exist_ok=True)
|
|
with (output / f"owned-redis-{uuid.uuid4().hex}.log").open("w") as log:
|
|
|
|
def build(port: int) -> OwnedRedis:
|
|
pid_file: Final = (
|
|
str(directory / f"owned-redis-{port}.pid")
|
|
if binary
|
|
else f"/tmp/integration-redis-{uuid.uuid4().hex}.pid"
|
|
)
|
|
command: Final = (
|
|
*prefix,
|
|
"--port",
|
|
str(port),
|
|
"--set-proc-title",
|
|
"no",
|
|
"--pidfile",
|
|
pid_file,
|
|
"--bind",
|
|
"0.0.0.0" if not binary else "127.0.0.1",
|
|
"--protected-mode",
|
|
"no",
|
|
"--save",
|
|
"",
|
|
"--appendonly",
|
|
"no",
|
|
)
|
|
return OwnedRedis(host, port, command, log, pid_file)
|
|
|
|
with _started(build, choose_port, PORT_ATTEMPTS, log.name) as server:
|
|
yield server
|