mirror of
https://github.com/MCKero6423/uv-k5-v3-emulator.git
synced 2026-10-02 03:15:36 +00:00
mckero
65e50c0065
Two faults that combined to take the web UI down twice in one session, each time
surfacing to the user as a 502 through the reverse proxy.
`pkill -f 'M uv-k5-v3'` in run.sh and trace_run.sh matched far more than intended.
-f tests the whole command line, so it also matched the shell running the pkill
(the pattern sits in its own argv), any script mentioning the machine type, and the
QEMU child of a running webui.py. Cleanup now lives in tools/lib_kill_emulator.sh:
pgrep -x on the binary name, confirm uv-k5-v3 in /proc/PID/cmdline, and optionally
scope to one QMP socket so a caller only stops the instance it owns.
The supervisor then could not recover from it. power_on() began with
`if self._client is not None: return False`, but a client object is not proof of a
live guest -- after an external kill the stale client made power_on refuse forever,
so the Power button was dead until the whole service was restarted. It now checks
whether the process actually exited and relaunches, logging why.
Tests:
- tools/test_kill_emulator.sh checks a plain process, a process whose command line
merely mentions uv-k5-v3, and the calling script all survive; that a real emulator
on a named socket is stopped; that one on another socket is not; and that an
unscoped call still clears everything. Verified it leaves a live webui.py alone.
- Two supervisor unit tests cover relaunch-after-external-kill and the case that
must still refuse, so this cannot regress into starting two emulators at once.
Verified end to end against the running web UI: kill the emulator from outside,
status reports unreachable, and pressing Power brings it back to
{"status":"running"} where before it stayed dead.
While writing the first version of the test I modelled the failure as a client
raising BrokenPipeError, which is not what is_running() looks at -- it checks
poll(). The mock was wrong, not the code; the test now has the process report an
exit status, which is what really happens.
48 lines
1.8 KiB
Bash
Executable File
48 lines
1.8 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# Terminate running emulator instances, and nothing else.
|
|
#
|
|
# Source this and call kill_emulators.
|
|
#
|
|
# Why this exists instead of a one-line pkill: `pkill -f 'M uv-k5-v3'` matches the
|
|
# whole command line, which includes
|
|
#
|
|
# - the shell running the pkill, because the pattern sits in its own argv
|
|
# - any test script or editor whose command line happens to mention the machine
|
|
# - a webui.py-owned QEMU, killing the web UI out from under a user; that produced
|
|
# a 502 through the reverse proxy twice in one session
|
|
#
|
|
# Matching the binary name exactly with pgrep -x, then confirming the machine type
|
|
# in /proc/PID/cmdline, keeps the blast radius to actual emulator processes.
|
|
|
|
# Kill emulator processes matching a QMP socket path, or all of them if none given.
|
|
#
|
|
# Scoping by socket matters even once the pattern is safe. A test that clears out
|
|
# "any emulator" still kills the one a running webui.py owns: the process survives
|
|
# but its guest is gone, so the user gets a dead screen and
|
|
# {"status":"unreachable"}. Passing the socket the caller is about to use leaves
|
|
# other people's instances alone.
|
|
kill_emulators() {
|
|
local want_sock="${1:-}" pid cmdline self=$$
|
|
|
|
for pid in $(pgrep -x qemu-system-arm 2>/dev/null || true); do
|
|
[ "$pid" = "$self" ] && continue
|
|
cmdline=$(tr '\0' ' ' < "/proc/$pid/cmdline" 2>/dev/null) || continue
|
|
|
|
# Must be one of ours.
|
|
case "$cmdline" in
|
|
*uv-k5-v3*) ;;
|
|
*) continue ;;
|
|
esac
|
|
|
|
# If a socket was named, only touch the instance serving it.
|
|
if [ -n "$want_sock" ]; then
|
|
case "$cmdline" in
|
|
*"$want_sock"*) ;;
|
|
*) continue ;;
|
|
esac
|
|
fi
|
|
|
|
kill "$pid" 2>/dev/null || true
|
|
done
|
|
}
|