test(update): cover fleet restart timeout isolation (#68523)
This commit is contained in:
parent
e99882c2d9
commit
b7b0c37ef7
|
|
@ -0,0 +1,118 @@
|
|||
"""Regression for #68523 — one systemctl timeout must not abort fleet restarts.
|
||||
|
||||
On hosts with many profile-backed ``hermes-gateway*.service`` units,
|
||||
``hermes update`` used to wrap the entire per-scope unit loop in a single
|
||||
``except subprocess.TimeoutExpired``. A timeout on unit N skipped units
|
||||
N+1…, leaving later gateways on pre-update in-memory modules while the
|
||||
checkout on disk was already new (mixed-generation crashes).
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import subprocess
|
||||
|
||||
import pytest
|
||||
|
||||
from hermes_cli.main import (
|
||||
_for_each_systemd_gateway_unit,
|
||||
_warn_incomplete_gateway_fleet_restart,
|
||||
)
|
||||
|
||||
|
||||
def _list_units_stdout(names: list[str]) -> str:
|
||||
return "\n".join(f"{name}.service loaded active running" for name in names)
|
||||
|
||||
|
||||
class TestFleetRestartTimeoutIsolation:
|
||||
def test_timeout_on_middle_unit_continues_remaining_units(self):
|
||||
units = [
|
||||
"hermes-gateway-xiaomo1",
|
||||
"hermes-gateway-xiaomo2",
|
||||
"hermes-gateway-xiaomo3",
|
||||
"hermes-gateway-xiaomo4",
|
||||
"hermes-gateway-xiaomo5",
|
||||
"hermes-gateway-xiaomo6",
|
||||
"hermes-gateway-xiaomo7",
|
||||
"hermes-gateway",
|
||||
]
|
||||
restarted: list[str] = []
|
||||
failed: list[str] = []
|
||||
timeout_cmds: list = []
|
||||
|
||||
def process_unit(svc_name: str) -> None:
|
||||
if svc_name == "hermes-gateway-xiaomo5":
|
||||
raise subprocess.TimeoutExpired(
|
||||
cmd=["systemctl", "--user", "--no-ask-password", "restart", svc_name],
|
||||
timeout=15,
|
||||
)
|
||||
restarted.append(svc_name)
|
||||
|
||||
def on_unit_timeout(svc_name: str, exc: subprocess.TimeoutExpired) -> None:
|
||||
failed.append(svc_name)
|
||||
timeout_cmds.append(exc.cmd)
|
||||
|
||||
_for_each_systemd_gateway_unit(
|
||||
_list_units_stdout(units),
|
||||
process_unit=process_unit,
|
||||
on_unit_timeout=on_unit_timeout,
|
||||
)
|
||||
|
||||
assert failed == ["hermes-gateway-xiaomo5"]
|
||||
assert restarted == [
|
||||
"hermes-gateway-xiaomo1",
|
||||
"hermes-gateway-xiaomo2",
|
||||
"hermes-gateway-xiaomo3",
|
||||
"hermes-gateway-xiaomo4",
|
||||
"hermes-gateway-xiaomo6",
|
||||
"hermes-gateway-xiaomo7",
|
||||
"hermes-gateway",
|
||||
]
|
||||
assert set(restarted) | set(failed) == set(units)
|
||||
assert timeout_cmds == [
|
||||
["systemctl", "--user", "--no-ask-password", "restart", "hermes-gateway-xiaomo5"]
|
||||
]
|
||||
|
||||
def test_non_gateway_units_in_list_output_are_ignored(self):
|
||||
seen: list[str] = []
|
||||
|
||||
_for_each_systemd_gateway_unit(
|
||||
"\n".join(
|
||||
[
|
||||
"ssh.service loaded active running",
|
||||
"hermes-gateway-coder.service loaded active running",
|
||||
"not-a-service loaded active running",
|
||||
"",
|
||||
]
|
||||
),
|
||||
process_unit=seen.append,
|
||||
on_unit_timeout=lambda *_: pytest.fail("unexpected timeout"),
|
||||
)
|
||||
|
||||
assert seen == ["hermes-gateway-coder"]
|
||||
|
||||
def test_process_errors_other_than_timeout_still_propagate(self):
|
||||
def process_unit(_svc_name: str) -> None:
|
||||
raise RuntimeError("not a timeout")
|
||||
|
||||
with pytest.raises(RuntimeError, match="not a timeout"):
|
||||
_for_each_systemd_gateway_unit(
|
||||
_list_units_stdout(["hermes-gateway"]),
|
||||
process_unit=process_unit,
|
||||
on_unit_timeout=lambda *_: pytest.fail("timeout handler must not run"),
|
||||
)
|
||||
|
||||
|
||||
class TestIncompleteFleetRestartWarning:
|
||||
def test_warns_with_exact_unrestarted_units(self, capsys):
|
||||
_warn_incomplete_gateway_fleet_restart(
|
||||
["hermes-gateway-xiaomo5", "hermes-gateway-xiaomo6", "hermes-gateway-xiaomo5"]
|
||||
)
|
||||
out = capsys.readouterr().out
|
||||
assert "Update incomplete" in out
|
||||
assert out.count("hermes-gateway-xiaomo5") == 1
|
||||
assert "hermes-gateway-xiaomo6" in out
|
||||
assert "pre-update code" in out
|
||||
|
||||
def test_noop_when_no_failures(self, capsys):
|
||||
_warn_incomplete_gateway_fleet_restart([])
|
||||
assert capsys.readouterr().out == ""
|
||||
Loading…
Reference in New Issue