kaxil commented on code in PR #44465:
URL: https://github.com/apache/airflow/pull/44465#discussion_r1863580386
##########
task_sdk/src/airflow/sdk/execution_time/supervisor.py:
##########
@@ -403,12 +403,57 @@ def _send_startup_message(self, ti: TaskInstance, path:
str | os.PathLike[str],
self.stdin.write(msg.model_dump_json().encode())
self.stdin.write(b"\n")
- def kill(self, signal: signal.Signals = signal.SIGINT):
+ def kill(
+ self,
+ signal_to_send: signal.Signals = signal.SIGINT,
+ escalation_delay: float = 5.0,
+ force: bool = False,
+ ):
+ """
+ Attempt to terminate the subprocess with a given signal.
+
+ If the process does not exit within `escalation_delay` seconds,
escalate to SIGTERM and eventually SIGKILL if necessary.
+
+ :param signal_to_send: The signal to send initially (default is
SIGINT).
+ :param escalation_delay: Time in seconds to wait before escalating to
a stronger signal.
+ :param force: If True, send the signal immediately without escalation.
+ """
if self._exit_code is not None:
return
- with suppress(ProcessLookupError):
- os.kill(self.pid, signal)
+ if not force:
+ with suppress(ProcessLookupError):
+ self._process.send_signal(signal_to_send)
+ return
+
+ # Escalation sequence: SIGINT -> SIGTERM -> SIGKILL
+ escalation_path = [signal.SIGINT, signal.SIGTERM, signal.SIGKILL]
+ if signal_to_send in escalation_path:
+ # Start from `initial_signal`
+ escalation_path =
escalation_path[escalation_path.index(signal_to_send) :]
+
+ for sig in escalation_path:
+ try:
+ self._process.send_signal(sig)
Review Comment:
https://github.com/giampaolo/psutil/blob/master/psutil/__init__.py#L1278-L1291
`psutil` manages some of that for us -- i.e. we don't have to check it
explicitly ourselves (re SIGTERM):
```py
def send_signal(self, sig):
"""Send a signal *sig* to process pre-emptively checking
whether PID has been reused (see signal module constants) .
On Windows only SIGTERM is valid and is treated as an alias
for kill().
"""
if POSIX:
self._send_signal(sig)
else: # pragma: no cover
self._raise_if_pid_reused()
if sig != signal.SIGTERM and not self.is_running():
msg = "process no longer exists"
raise NoSuchProcess(self.pid, self._name, msg=msg)
self._proc.send_signal(sig)
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@airflow.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
