Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Enable reconnection in DB pool #8726

Merged
merged 2 commits into from
Nov 12, 2020
Merged

Enable reconnection in DB pool #8726

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
23f05c8
Enable reconnection in DB pool
erikjohnston Nov 6, 2020
45ebae8
Newsfile
erikjohnston Nov 6, 2020
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
1 change: 1 addition & 0 deletions changelog.d/8726.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix bug where Synapse would not recover after losing connection to the database.
Copy link
Member

Choose a reason for hiding this comment

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

Assuming #8456 was what led to the breakage(?), then the issue was introduced in v1.21.0.

Copy link
Member Author

Choose a reason for hiding this comment

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

I really don't see why this would be more of an issue in v1.21 TBH, so I'm slightly hesitant to say this is fixing a regression 🤷

7 changes: 6 additions & 1 deletion synapse/storage/database.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,18 @@ def make_pool(
"""Get the connection pool for the database.
"""

# By default enable `cp_reconnect`. We need to fiddle with db_args in case
# someone has explicitly set `cp_reconnect`.
db_args = dict(db_config.config.get("args", {}))
Copy link
Member

Choose a reason for hiding this comment

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

What's the reason for the explicit dict cast? In case users put a list here instead or something?

Copy link
Member Author

Choose a reason for hiding this comment

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

To take a copy so that we don't modify db_config

db_args.setdefault("cp_reconnect", True)

return adbapi.ConnectionPool(
db_config.config["name"],
cp_reactor=reactor,
cp_openfun=lambda conn: engine.on_new_connection(
LoggingDatabaseConnection(conn, engine, "on_new_connection")
),
**db_config.config.get("args", {}),
**db_args,
)


Expand Down