Skip to content

Commit

Permalink
Do not log during signal handler (dask#6590)
Browse files Browse the repository at this point in the history
  • Loading branch information
fjetter committed Jun 17, 2022
1 parent b06488f commit 8d21040
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
3 changes: 2 additions & 1 deletion distributed/_signals.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@ async def wait_for_signals(signals: list[signal.Signals]) -> None:
old_handlers: dict[int, Any] = {}

def handle_signal(signum, frame):
# *** Do not log or print anything in here
# https://stackoverflow.com/questions/45680378/how-to-explain-the-reentrant-runtimeerror-caused-by-printing-in-signal-handlers
# Restore old signal handler to allow for quicker exit
# if the user sends the signal again.
signal.signal(signum, old_handlers[signum])
logger.info("Received signal %s (%d)", signal.Signals(signum).name, signum)
loop.call_soon_threadsafe(event.set)

for sig in signals:
Expand Down
1 change: 0 additions & 1 deletion distributed/cli/tests/test_dask_scheduler.py
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,5 @@ def test_signal_handling(loop, sig):
logs = stdout.decode().lower()
assert stderr is None
assert scheduler.returncode == 0
assert sig.name.lower() in logs
assert "scheduler closing" in logs
assert "end scheduler" in logs
1 change: 0 additions & 1 deletion distributed/cli/tests/test_dask_worker.py
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,6 @@ async def test_signal_handling(c, s, nanny, sig):
logs = stdout.decode().lower()
assert stderr is None
assert worker.returncode == 0
assert sig.name.lower() in logs
if nanny == "--nanny":
assert "closing nanny" in logs
assert "stopping worker" in logs
Expand Down

0 comments on commit 8d21040

Please sign in to comment.