Skip to content

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

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
merged 2 commits into from
Dec 1, 2022
+6 −1
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df9c618
terminating only once
Dec 1, 2022
b44c026
changelog
Dec 1, 2022
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
2 changes: 2 additions & 0 deletions src/lightning_app/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).

- Fixed the `enable_spawn` method of the `WorkRunExecutor` ([#15812](https://github.com/Lightning-AI/lightning/pull/15812)

- Fixed Sigterm Handler causing thread lock which caused KeyboardInterrupt to hang ([#15881](https://github.com/Lightning-AI/lightning/pull/15881))


## [1.8.3] - 2022-11-22

Expand Down
5 changes: 4 additions & 1 deletion src/lightning_app/runners/multiprocess.py
View file
Open in desktop
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:
self.terminate()

def terminate(self):
if APP_SERVER_IN_CLOUD:
Expand Down