Skip to content
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.

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

[App] Fixing Sigterm Handler causing thread lock which caused KeyboardInterrupt to hang #15881

Merged
merged 2 commits into from
Dec 1, 2022
Merged
Changes from 1 commit
Commits
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
5 changes: 4 additions & 1 deletion src/lightning_app/runners/multiprocess.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ class MultiProcessRuntime(Runtime):
"""

backend: Union[str, Backend] = "multiprocessing"
_has_triggered_termination: bool = False

def dispatch(self, *args: Any, on_before_run: Optional[Callable] = None, **kwargs: Any):
"""Method to dispatch and run the LightningApp."""
Expand Down Expand Up @@ -111,9 +112,11 @@ def dispatch(self, *args: Any, on_before_run: Optional[Callable] = None, **kwarg
self.app._run()
except KeyboardInterrupt:
self.terminate()
self._has_triggered_termination = True
raise
finally:
self.terminate()
if not self._has_triggered_termination:
hhsecond marked this conversation as resolved.
Show resolved Hide resolved
self.terminate()

def terminate(self):
if APP_SERVER_IN_CLOUD:
Expand Down