From 452b0a91c2bf837ddcd31360831b6ee3c271cf10 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Thu, 6 Jun 2024 03:20:45 -0700 Subject: [PATCH] reproduction, manager gets SIGTERM from python_process old-commit-hash: b90402bd776c3933bfe3dd60998f9913b4bd0068 --- cpp_process.py | 6 +++ python_process.py | 12 +++++ system/manager/manager.py | 7 ++- system/manager/process_config.py | 85 ++++++++++++++++---------------- 4 files changed, 67 insertions(+), 43 deletions(-) create mode 100644 cpp_process.py create mode 100644 python_process.py diff --git a/cpp_process.py b/cpp_process.py new file mode 100644 index 0000000000..5af7225b79 --- /dev/null +++ b/cpp_process.py @@ -0,0 +1,6 @@ +import time + +if __name__ == "__main__": + print('python process!') + while True: + time.sleep(1) diff --git a/python_process.py b/python_process.py new file mode 100644 index 0000000000..600b286774 --- /dev/null +++ b/python_process.py @@ -0,0 +1,12 @@ +import os +import subprocess + +from openpilot.common.basedir import BASEDIR + + +def main(): + print('pandad!') + + while True: + os.chdir(os.path.join(BASEDIR)) + subprocess.run(["python", "cpp_process.py"], check=True) diff --git a/system/manager/manager.py b/system/manager/manager.py index 6d1b8d9c22..2055cc3a23 100755 --- a/system/manager/manager.py +++ b/system/manager/manager.py @@ -180,8 +180,13 @@ def main() -> None: if os.getenv("PREPAREONLY") is not None: return + def here(sig, frame): + print('manager got signal', sig) + sys.exit() + # SystemExit on sigterm - signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit(1)) + # signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit(1)) + signal.signal(signal.SIGTERM, here) try: manager_thread() diff --git a/system/manager/process_config.py b/system/manager/process_config.py index ced31077c9..b91c76c165 100644 --- a/system/manager/process_config.py +++ b/system/manager/process_config.py @@ -42,50 +42,51 @@ def only_offroad(started, params, CP: car.CarParams) -> bool: return not started procs = [ - DaemonProcess("manage_athenad", "system.athena.manage_athenad", "AthenadPid"), - - NativeProcess("camerad", "system/camerad", ["./camerad"], driverview), - NativeProcess("logcatd", "system/logcatd", ["./logcatd"], only_onroad), - NativeProcess("proclogd", "system/proclogd", ["./proclogd"], only_onroad), - PythonProcess("logmessaged", "system.logmessaged", always_run), - PythonProcess("micd", "system.micd", iscar), - PythonProcess("timed", "system.timed", always_run, enabled=not PC), - - PythonProcess("dmonitoringmodeld", "selfdrive.modeld.dmonitoringmodeld", driverview, enabled=(not PC or WEBCAM)), - NativeProcess("encoderd", "system/loggerd", ["./encoderd"], only_onroad), - NativeProcess("stream_encoderd", "system/loggerd", ["./encoderd", "--stream"], notcar), - NativeProcess("loggerd", "system/loggerd", ["./loggerd"], logging), - NativeProcess("modeld", "selfdrive/modeld", ["./modeld"], only_onroad), - NativeProcess("sensord", "system/sensord", ["./sensord"], only_onroad, enabled=not PC), - NativeProcess("ui", "selfdrive/ui", ["./ui"], always_run, watchdog_max_dt=(5 if not PC else None)), - PythonProcess("soundd", "selfdrive.ui.soundd", only_onroad), - NativeProcess("locationd", "selfdrive/locationd", ["./locationd"], only_onroad), - NativeProcess("pandad", "selfdrive/pandad", ["./pandad"], always_run, enabled=False), - PythonProcess("calibrationd", "selfdrive.locationd.calibrationd", only_onroad), - PythonProcess("torqued", "selfdrive.locationd.torqued", only_onroad), - PythonProcess("controlsd", "selfdrive.controls.controlsd", only_onroad), - PythonProcess("card", "selfdrive.car.card", only_onroad), - PythonProcess("deleter", "system.loggerd.deleter", always_run), - PythonProcess("dmonitoringd", "selfdrive.monitoring.dmonitoringd", driverview, enabled=(not PC or WEBCAM)), - PythonProcess("qcomgpsd", "system.qcomgpsd.qcomgpsd", qcomgps, enabled=TICI), - #PythonProcess("ugpsd", "system.ugpsd", only_onroad, enabled=TICI), - PythonProcess("navd", "selfdrive.navd.navd", only_onroad), - PythonProcess("pandad", "selfdrive.pandad.pandad", always_run), - PythonProcess("paramsd", "selfdrive.locationd.paramsd", only_onroad), - NativeProcess("ubloxd", "system/ubloxd", ["./ubloxd"], ublox, enabled=TICI), - PythonProcess("pigeond", "system.ubloxd.pigeond", ublox, enabled=TICI), - PythonProcess("plannerd", "selfdrive.controls.plannerd", only_onroad), - PythonProcess("radard", "selfdrive.controls.radard", only_onroad), - PythonProcess("hardwared", "system.hardware.hardwared", always_run), - PythonProcess("tombstoned", "system.tombstoned", always_run, enabled=not PC), - PythonProcess("updated", "system.updated.updated", only_offroad, enabled=not PC), - PythonProcess("uploader", "system.loggerd.uploader", always_run), - PythonProcess("statsd", "system.statsd", always_run), + # DaemonProcess("manage_athenad", "system.athena.manage_athenad", "AthenadPid"), + # + # NativeProcess("camerad", "system/camerad", ["./camerad"], driverview), + # NativeProcess("logcatd", "system/logcatd", ["./logcatd"], only_onroad), + # NativeProcess("proclogd", "system/proclogd", ["./proclogd"], only_onroad), + # PythonProcess("logmessaged", "system.logmessaged", always_run), + # PythonProcess("micd", "system.micd", iscar), + # PythonProcess("timed", "system.timed", always_run, enabled=not PC), + # + # PythonProcess("dmonitoringmodeld", "selfdrive.modeld.dmonitoringmodeld", driverview, enabled=(not PC or WEBCAM)), + # NativeProcess("encoderd", "system/loggerd", ["./encoderd"], only_onroad), + # NativeProcess("stream_encoderd", "system/loggerd", ["./encoderd", "--stream"], notcar), + # NativeProcess("loggerd", "system/loggerd", ["./loggerd"], logging), + # NativeProcess("modeld", "selfdrive/modeld", ["./modeld"], only_onroad), + # NativeProcess("sensord", "system/sensord", ["./sensord"], only_onroad, enabled=not PC), + # NativeProcess("ui", "selfdrive/ui", ["./ui"], always_run, watchdog_max_dt=(5 if not PC else None)), + # PythonProcess("soundd", "selfdrive.ui.soundd", only_onroad), + # NativeProcess("locationd", "selfdrive/locationd", ["./locationd"], only_onroad), + # NativeProcess("pandad", "selfdrive/pandad", ["./pandad"], always_run, enabled=False), + # PythonProcess("calibrationd", "selfdrive.locationd.calibrationd", only_onroad), + # PythonProcess("torqued", "selfdrive.locationd.torqued", only_onroad), + # PythonProcess("controlsd", "selfdrive.controls.controlsd", only_onroad), + # PythonProcess("card", "selfdrive.car.card", only_onroad), + # PythonProcess("deleter", "system.loggerd.deleter", always_run), + # PythonProcess("dmonitoringd", "selfdrive.monitoring.dmonitoringd", driverview, enabled=(not PC or WEBCAM)), + # PythonProcess("qcomgpsd", "system.qcomgpsd.qcomgpsd", qcomgps, enabled=TICI), + # #PythonProcess("ugpsd", "system.ugpsd", only_onroad, enabled=TICI), + # PythonProcess("navd", "selfdrive.navd.navd", only_onroad), + # PythonProcess("pandad", "selfdrive.pandad.pandad", always_run), + # PythonProcess("paramsd", "selfdrive.locationd.paramsd", only_onroad), + # NativeProcess("ubloxd", "system/ubloxd", ["./ubloxd"], ublox, enabled=TICI), + # PythonProcess("pigeond", "system.ubloxd.pigeond", ublox, enabled=TICI), + # PythonProcess("plannerd", "selfdrive.controls.plannerd", only_onroad), + # PythonProcess("radard", "selfdrive.controls.radard", only_onroad), + # PythonProcess("hardwared", "system.hardware.hardwared", always_run), + # PythonProcess("tombstoned", "system.tombstoned", always_run, enabled=not PC), + # PythonProcess("updated", "system.updated.updated", only_offroad, enabled=not PC), + # PythonProcess("uploader", "system.loggerd.uploader", always_run), + # PythonProcess("statsd", "system.statsd", always_run), + PythonProcess("python_process", "python_process", always_run), # debug procs - NativeProcess("bridge", "cereal/messaging", ["./bridge"], notcar), - PythonProcess("webrtcd", "system.webrtc.webrtcd", notcar), - PythonProcess("webjoystick", "tools.bodyteleop.web", notcar), + # NativeProcess("bridge", "cereal/messaging", ["./bridge"], notcar), + # PythonProcess("webrtcd", "system.webrtc.webrtcd", notcar), + # PythonProcess("webjoystick", "tools.bodyteleop.web", notcar), ] managed_processes = {p.name: p for p in procs}