Skip to content

Fix process killing with subprocess API #30207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
potiuk merged 2 commits into from
Mar 21, 2023
Merged

Fix process killing with subprocess API #30207

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2b284f
Fix process killing with subprocess API
uranusjr Mar 21, 2023
a9c2bed
Improve signal handler typing
uranusjr Mar 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions airflow/cli/commands/webserver_command.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import sys
import textwrap
import time
import types
from contextlib import suppress
from time import sleep
from typing import NoReturn
Expand Down Expand Up @@ -425,18 +426,22 @@ def webserver(args):
# then have a copy of the app
run_args += ["--preload"]

gunicorn_master_proc: psutil.Process | None = None
gunicorn_master_proc: psutil.Process | subprocess.Popen

def kill_proc(signum, _):
def kill_proc(signum: int, frame: types.FrameType | None) -> NoReturn:
log.info("Received signal: %s. Closing gunicorn.", signum)
gunicorn_master_proc.terminate()
with suppress(TimeoutError):
gunicorn_master_proc.wait(timeout=30)
if gunicorn_master_proc.is_running():
if isinstance(gunicorn_master_proc, subprocess.Popen):
still_running = gunicorn_master_proc.poll() is not None
else:
still_running = gunicorn_master_proc.is_running()
if still_running:
gunicorn_master_proc.kill()
sys.exit(0)

def monitor_gunicorn(gunicorn_master_pid: int):
def monitor_gunicorn(gunicorn_master_pid: int) -> NoReturn:
# Register signal handlers
signal.signal(signal.SIGINT, kill_proc)
signal.signal(signal.SIGTERM, kill_proc)
Expand Down