Skip to content

fix(deltachat-rpc-client): shutdown all threads after RPC server crash #8766

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
link2xt merged 1 commit into from
Oct 3, 2026
Merged

fix(deltachat-rpc-client): shutdown all threads after RPC server crash #8766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 deltachat-rpc-client/src/deltachat_rpc_client/rpc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,10 @@ def start(self) -> None:
def close(self) -> None:
"""Terminate RPC server process and wait until the reader loop finishes."""
self.closing = True
self.stop_io_for_all_accounts()
# JSON-RPC error may happen if RPC server process has crashed already.
# We still want to shutdown all threads in this case.

@link2xt link2xt Sep 29, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did not check which thread gets stuck, but it is likely writer_thread because it waits forever for a request to arrive in self.request_queue.get().

with contextlib.suppress(JsonRpcError):
self.stop_io_for_all_accounts()
# Let `events_loop` stop cleanly on `closing` before the pipe goes away,
# otherwise it might exit through an "RPC server closed" error instead.
self.events_thread.join()
Expand Down
13 changes: 13 additions & 0 deletions deltachat-rpc-client/tests/test_something.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,19 @@ def test_sleep(rpc) -> None:
assert sleep_5_future in pending


def test_shutdown(rpc) -> None:
"""Test RPC client shutdown if RPC server process is terminated.

This is a regression test, at the time of adding it RPC client
did not terminate all threads and python process did not exit.
Shutting down all threads is tested implicitly by pytest-timeout.
"""
rpc.process.kill()
rpc.process.wait()
with pytest.raises(JsonRpcError):
rpc.get_system_info()


def test_email_address_validity(rpc) -> None:
valid_addresses = [
"email@example.com",
Expand Down
Loading