Simone/local-ci-cd-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(prepare-win): detect reboot by boot-time, not TCP-down

Browse Source 
A fast reboot never showed TCP/5986 "down" between polls, so the old
down→up wait could hang on "waiting for VM to go down" until timeout.

Replace it: record the guest LastBootUpTime (FileTime ticks) before the
reboot, then poll until the port is back AND the boot time is newer — a
signal immune to reboot speed. Applies to both the 3010 loop and the final
reboot. Drops _wait_tcp_down in favour of _tcp_open + _guest_boot_ticks.
This commit is contained in:
Simone
2026-06-09 21:39:36 +02:00
parent 5fe68589f5
commit 54feb43513
2 changed files with 64 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/python/test_commands_template.py
+18 -33
View File
@@ -363,44 +363,28 @@ def test_wait_tcp_timeout(monkeypatch: pytest.MonkeyPatch) -> None:
assert tmpl_mod._wait_tcp("127.0.0.1", 9999, 0.0) is False
def test_wait_tcp_down_detects_down(monkeypatch: pytest.MonkeyPatch) -> None:
monkeypatch.setattr(
tmpl_mod.socket, "create_connection",
lambda *a, **kw: (_ for _ in ()).throw(OSError("down")),
)
assert tmpl_mod._wait_tcp_down("127.0.0.1", 5986, 5.0) is True
def test_wait_tcp_down_still_up(monkeypatch: pytest.MonkeyPatch) -> None:
class _FakeConn:
def __enter__(self) -> _FakeConn:
return self
def __exit__(self, *_: object) -> None:
pass
monkeypatch.setattr(tmpl_mod.socket, "create_connection", lambda *a, **kw: _FakeConn())
monkeypatch.setattr(tmpl_mod.time, "sleep", lambda _: None)
assert tmpl_mod._wait_tcp_down("127.0.0.1", 5986, 0.0) is False
def test_reboot_and_wait(monkeypatch: pytest.MonkeyPatch) -> None:
def test_reboot_and_wait_boot_change(monkeypatch: pytest.MonkeyPatch) -> None:
calls: list[str] = []
transport = MagicMock()
transport.run.side_effect = lambda *_a, **_k: calls.append("reboot")
transport.close.side_effect = lambda: calls.append("close")
monkeypatch.setattr(tmpl_mod, "_wait_tcp_down", lambda *a, **k: True)
monkeypatch.setattr(tmpl_mod, "_wait_tcp", lambda *a, **k: True)
monkeypatch.setattr(tmpl_mod, "_tcp_open", lambda *a, **k: True)
# boot ticks: before reboot, then a newer value once it's back.
ticks = iter([100, 200])
monkeypatch.setattr(tmpl_mod, "_guest_boot_ticks", lambda _t: next(ticks))
monkeypatch.setattr(tmpl_mod, "_wait_winrm", lambda *a, **k: calls.append("winrm"))
monkeypatch.setattr(tmpl_mod.time, "sleep", lambda _s: None)
tmpl_mod._reboot_and_wait(transport, "10.0.0.5", 5986, 30)
assert calls == ["reboot", "close", "winrm"]
assert "winrm" in calls
transport.close.assert_called_once()
def test_reboot_and_wait_unreachable(monkeypatch: pytest.MonkeyPatch) -> None:
def test_reboot_and_wait_timeout(monkeypatch: pytest.MonkeyPatch) -> None:
transport = MagicMock()
monkeypatch.setattr(tmpl_mod, "_wait_tcp_down", lambda *a, **k: True)
monkeypatch.setattr(tmpl_mod, "_wait_tcp", lambda *a, **k: False)
with pytest.raises(click.ClickException, match="not reachable after reboot"):
monkeypatch.setattr(tmpl_mod, "_tcp_open", lambda *a, **k: False) # never comes back
monkeypatch.setattr(tmpl_mod, "_guest_boot_ticks", lambda _t: 100)
monkeypatch.setattr(tmpl_mod.time, "sleep", lambda _s: None)
clock = iter([0.0, 1.0, 1e9]) # deadline calc, one loop check, then past deadline
monkeypatch.setattr(tmpl_mod.time, "monotonic", lambda: next(clock))
with pytest.raises(click.ClickException, match="did not reboot"):
tmpl_mod._reboot_and_wait(transport, "10.0.0.5", 5986, 1)
@@ -530,7 +514,7 @@ def _patch_prepare(monkeypatch: pytest.MonkeyPatch, backend: MagicMock, transpor
monkeypatch.setattr(tmpl_mod, "WorkstationVmrunBackend", lambda **_: backend)
monkeypatch.setattr(tmpl_mod, "WinRmTransport", lambda **_: transport)
monkeypatch.setattr(tmpl_mod, "_wait_tcp", lambda *_: True)
monkeypatch.setattr(tmpl_mod, "_wait_tcp_down", lambda *_a, **_k: True)
monkeypatch.setattr(tmpl_mod, "_reboot_and_wait", lambda *_a, **_k: None)
monkeypatch.setattr(tmpl_mod, "_wait_winrm", lambda *_: None)
monkeypatch.setattr(tmpl_mod, "_check_guest_idle", lambda *_a, **_k: None)
monkeypatch.setattr(tmpl_mod.time, "sleep", lambda _: None)
@@ -694,7 +678,8 @@ def test_prepare_win_snapshot_exists_recreate(
monkeypatch.setattr(tmpl_mod, "WorkstationVmrunBackend", lambda **_: backend)
monkeypatch.setattr(tmpl_mod, "WinRmTransport", lambda **_: transport)
monkeypatch.setattr(tmpl_mod, "_wait_tcp", lambda *_: True)
monkeypatch.setattr(tmpl_mod, "_wait_tcp_down", lambda *_a, **_k: True)
monkeypatch.setattr(tmpl_mod, "_reboot_and_wait", lambda *_a, **_k: None)
monkeypatch.setattr(tmpl_mod, "_check_guest_idle", lambda *_a, **_k: None)
monkeypatch.setattr(tmpl_mod, "_wait_winrm", lambda *_: None)
monkeypatch.setattr(tmpl_mod.time, "sleep", lambda _: None)
def _sp_run(cmd: list[str], **_: object) -> None: