scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-11-13 08:52:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 174

test(routing): keep the Redis MONITOR capture alive across idle gaps

Browse source 
The capture read monitor.listen() with a 1 s socket timeout. listen() is a
generator, so the first timeout closed it and the thread stopped recording
without an error. Read with next_command() and no timeout, stop on the
capture's own stop marker, and fail clearly when that marker is never seen.
This commit is contained in:
mateo-berri 2026-11-07 07:48:38 -08:00
parent 0b48622598
commit 52851e10f6
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tests/integration/routing/test_usage_based_routing_redis_reads.py
View file

@ -21,7 +21,6 @@ from integration._support.redis_process import owned_redis
from integration._support.wire import Reply, Request, wire_server
from pydantic import JsonValue, TypeAdapter
from redis import Redis
from redis.exceptions import TimeoutError as RedisTimeoutError
JSON_OBJECT: Final = TypeAdapter(dict[str, JsonValue])
MODEL_INFO_ENTRIES: Final = TypeAdapter(tuple[dict[str, JsonValue], ...])
@ -130,21 +129,19 @@ def _capture_redis_commands(host: str, port: int) -> Iterator[SimpleQueue[str]]:
stop_marker: Final = f"monitor-stop-{uuid.uuid4().hex}"
def capture() -> None:
with Redis(host=host, port=port, socket_timeout=1, decode_responses=True) as client:
with Redis(host=host, port=port, decode_responses=True) as client:
with client.monitor() as monitor:
started.set()
stream: Final = iter(monitor.listen())
while not stopped.is_set():
try:
record: Final = MONITOR_COMMAND.validate_python(next(stream))
except RedisTimeoutError:
continue
record: Final = MONITOR_COMMAND.validate_python(monitor.next_command())
command: Final = record.get("command")
if not isinstance(command, str):
continue
commands.put(command)
if ready_marker in command:
armed.set()
if stop_marker in command:
stopped.set()
thread: Final = threading.Thread(target=capture, daemon=True)
thread.start()
@ -155,9 +152,9 @@ def _capture_redis_commands(host: str, port: int) -> Iterator[SimpleQueue[str]]:
assert armed.wait(timeout=5), "Redis MONITOR did not capture its readiness command"
yield commands
finally:
stopped.set()
with Redis(host=host, port=port, socket_timeout=1, decode_responses=True) as client:
client.set(stop_marker, "stop", ex=1)
assert stopped.wait(timeout=5), "Redis MONITOR stopped before it captured the stop command"
thread.join(timeout=5)
assert not thread.is_alive(), "Redis MONITOR thread survived cleanup"