Runtime: do not send kill to init

carrier-io · Nov 27, 2024 · d5daf12 · d5daf12
1 parent ae60caa
commit d5daf12
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/pylon/core/tools/signal.py b/pylon/core/tools/signal.py
@@ -34,7 +34,7 @@ def signal_sigterm(signal_num, stack_frame):
     raise SystemExit
 
 
-def kill_remaining_processes():
+def kill_remaining_processes(context):
     """ Send SIGKILL to all other processes """
     try:
         current_pid = os.getpid()
@@ -44,7 +44,10 @@ def kill_remaining_processes():
         #
         for pid in running_pids:
             if pid == current_pid:
-                continue
+                continue  # Skip pylon itself
+            #
+            if pid == 1 and context.runtime_init == "dumb-init":
+                continue  # Skip init
             #
             log.info("Killing remaining process: %s", pid)
             #

diff --git a/pylon/main.py b/pylon/main.py
@@ -199,7 +199,7 @@ def main():  # pylint: disable=R0912,R0914,R0915
     # Kill remaining processes to avoid keeping the container running on update
     if context.settings.get("system", {}).get("kill_remaining_processes", True) and \
             context.runtime_init in ["pylon", "dumb-init"]:
-        kill_remaining_processes()
+        kill_remaining_processes(context)
     # Exit
     log.info("Exiting")